Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

core: rename crosscore-readonly to crosscore #1061

Merged
merged 2 commits into from Apr 26, 2017
Merged

core: rename crosscore-readonly to crosscore #1061

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
18e93e8
core: rename crosscore-readonly to crosscore
tessr Apr 26, 2017
dd3fe23
auto rev id
iampogo Apr 26, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/corectl/main.go
View file
Open in desktop
Expand Up @@ -227,7 +227,7 @@ func createToken(client *rpc.Client, args []string) {
case len(args) == 2:
grant.Policy = args[1]
case *flagNet:
grant.Policy = "crosscore-readonly"
grant.Policy = "crosscore"
fmt.Fprintln(os.Stderr, "warning: the network flag is deprecated")
default:
grant.Policy = "client-readwrite"
Expand Down
2 changes: 1 addition & 1 deletion core/access_tokens.go
View file
Open in desktop
Expand Up @@ -46,7 +46,7 @@ func (a *API) createAccessToken(ctx context.Context, x struct{ ID, Type string }
grant = authz.Grant{
GuardType: "access_token",
GuardData: guardData,
Policy: "crosscore-readonly",
Policy: "crosscore",
}
default:
// We've already returned if x.Type wasn't specified, so this must be a bad type.
Expand Down
16 changes: 8 additions & 8 deletions core/authz.go
View file
Open in desktop
Expand Up @@ -5,7 +5,7 @@ const grantPrefix = "/core/grant/"
var policies = []string{
"client-readwrite",
"client-readonly",
"crosscore-readonly",
"crosscore",
"monitoring",
"internal",
"public",
Expand Down Expand Up @@ -39,12 +39,12 @@ var policyByRoute = map[string][]string{
"/list-unspent-outputs": {"client-readwrite", "client-readonly"},
"/reset": {"client-readwrite", "internal"},

networkRPCPrefix + "submit": {"crosscore-readonly"},
networkRPCPrefix + "get-block": {"crosscore-readonly"},
networkRPCPrefix + "get-snapshot-info": {"crosscore-readonly"},
networkRPCPrefix + "get-snapshot": {"crosscore-readonly"},
networkRPCPrefix + "signer/sign-block": {"crosscore-readonly"}, // TODO(tessr): make this crosscore-signblock
networkRPCPrefix + "block-height": {"crosscore-readonly"},
networkRPCPrefix + "submit": {"crosscore"},
networkRPCPrefix + "get-block": {"crosscore"},
networkRPCPrefix + "get-snapshot-info": {"crosscore"},
networkRPCPrefix + "get-snapshot": {"crosscore"},
networkRPCPrefix + "signer/sign-block": {"crosscore"}, // TODO(tessr): make this crosscore-signblock
networkRPCPrefix + "block-height": {"crosscore"},

"/list-authorization-grants": {"client-readwrite", "client-readonly"},
"/create-authorization-grant": {"client-readwrite"},
Expand All @@ -53,7 +53,7 @@ var policyByRoute = map[string][]string{
"/list-access-tokens": {"client-readwrite", "client-readonly"},
"/delete-access-token": {"client-readwrite"},
"/configure": {"client-readwrite", "internal"},
"/info": {"client-readwrite", "client-readonly", "crosscore-readonly", "monitoring"},
"/info": {"client-readwrite", "client-readonly", "crosscore", "monitoring"},

"/debug/vars": {"client-readwrite", "client-readonly", "monitoring"}, // should monitoring endpoints also be available to any other policy-holders?
"/debug/pprof": {"client-readwrite", "client-readonly", "monitoring"},
Expand Down
98 changes: 49 additions & 49 deletions core/authz_test.go
View file
Open in desktop
Expand Up @@ -57,7 +57,7 @@ func TestAuthz(t *testing.T) {
testPolicies := []string{
"client-readwrite",
"client-readonly",
"crosscore-readonly",
"crosscore",
"monitoring",
"internal",
"public",
Expand All @@ -81,68 +81,68 @@ func TestAuthz(t *testing.T) {

pathTokenMap := map[string]map[string]bool{
"/create-account": map[string]bool{
"client-readwrite": true,
"client-readonly": false,
"crosscore-readonly": false,
"monitoring": false,
"internal": false,
"public": false,
"client-readwrite": true,
"client-readonly": false,
"crosscore": false,
"monitoring": false,
"internal": false,
"public": false,
},
"/list-accounts": map[string]bool{
"client-readwrite": true,
"client-readonly": true,
"crosscore-readonly": false,
"monitoring": false,
"internal": false,
"public": false,
"client-readwrite": true,
"client-readonly": true,
"crosscore": false,
"monitoring": false,
"internal": false,
"public": false,
},
"/reset": map[string]bool{
"client-readwrite": true,
"client-readonly": false,
"crosscore-readonly": false,
"monitoring": false,
"internal": true,
"public": false,
"client-readwrite": true,
"client-readonly": false,
"crosscore": false,
"monitoring": false,
"internal": true,
"public": false,
},
networkRPCPrefix + "get-block": map[string]bool{
"client-readwrite": false,
"client-readonly": false,
"crosscore-readonly": true,
"monitoring": false,
"internal": false,
"public": false,
"client-readwrite": false,
"client-readonly": false,
"crosscore": true,
"monitoring": false,
"internal": false,
"public": false,
},
"/info": map[string]bool{
"client-readwrite": true,
"client-readonly": true,
"crosscore-readonly": true,
"monitoring": true,
"internal": false,
"public": false,
"client-readwrite": true,
"client-readonly": true,
"crosscore": true,
"monitoring": true,
"internal": false,
"public": false,
},
"/debug/pprof/symbol": map[string]bool{
"client-readwrite": true,
"client-readonly": true,
"crosscore-readonly": false,
"monitoring": true,
"internal": false,
"public": false,
"client-readwrite": true,
"client-readonly": true,
"crosscore": false,
"monitoring": true,
"internal": false,
"public": false,
},
"/raft/msg": map[string]bool{
"client-readwrite": false,
"client-readonly": false,
"crosscore-readonly": false,
"monitoring": false,
"internal": true,
"public": false,
"client-readwrite": false,
"client-readonly": false,
"crosscore": false,
"monitoring": false,
"internal": true,
"public": false,
},
"/dashboard": map[string]bool{ // public is open to all
"client-readwrite": true,
"client-readonly": true,
"crosscore-readonly": true,
"monitoring": true,
"internal": true,
"public": true,
"client-readwrite": true,
"client-readonly": true,
"crosscore": true,
"monitoring": true,
"internal": true,
"public": true,
},
}

Expand Down
2 changes: 1 addition & 1 deletion core/config/config.go
View file
Open in desktop
Expand Up @@ -323,7 +323,7 @@ func migrateAccessTokens(ctx context.Context, db pg.DB, rDB *raft.Service) error
case "client":
grant.Policy = "client-readwrite"
case "network":
grant.Policy = "crosscore-readonly"
grant.Policy = "crosscore"
}
_, err = authz.StoreGrant(ctx, rDB, grant, grantPrefix)
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion net/http/authz/loopback_authz.go
View file
Open in desktop
Expand Up @@ -7,7 +7,7 @@ func init() {
&Grant{GuardType: "localhost", Policy: "client-readwrite"},
&Grant{GuardType: "localhost", Policy: "client-readonly"},
&Grant{GuardType: "localhost", Policy: "monitoring"},
&Grant{GuardType: "localhost", Policy: "crosscore-readonly"},
&Grant{GuardType: "localhost", Policy: "crosscore"},
&Grant{GuardType: "localhost", Policy: "internal"},
)
}