veyron2/security, veyron/security: Move ACL authorizer to veyron/security.
ACL authorizer is the default implementation of Authorizer, and is
intended to be used by both the Veyron runtime and applications.
Change-Id: Ib17097ccb94ccc2cd629a851b9a1c9fa29ef3d27
diff --git a/security/flag/flag.go b/security/flag/flag.go
index fa032b8..11dfcca 100644
--- a/security/flag/flag.go
+++ b/security/flag/flag.go
@@ -7,6 +7,8 @@
"errors"
"flag"
+ vsecurity "veyron/security"
+
"veyron2/security"
)
@@ -27,11 +29,11 @@
panic(errors.New("only one of the flags \"--acl\" or \"--acl_file\" must be provided"))
}
if len(*aclFile) != 0 {
- return security.NewFileACLAuthorizer(*aclFile)
+ return vsecurity.NewFileACLAuthorizer(*aclFile)
}
a, err := security.LoadACL(bytes.NewBufferString(*acl))
if err != nil {
return nil
}
- return security.NewACLAuthorizer(a)
+ return vsecurity.NewACLAuthorizer(a)
}
diff --git a/security/flag/flag_test.go b/security/flag/flag_test.go
index 5fa5616..03ae915 100644
--- a/security/flag/flag_test.go
+++ b/security/flag/flag_test.go
@@ -7,6 +7,7 @@
"testing"
tsecurity "veyron/lib/testutil/security"
+ vsecurity "veyron/security"
"veyron2/security"
)
@@ -45,19 +46,19 @@
},
{
flags: flagValue{"acl": "{}"},
- wantAuth: security.NewACLAuthorizer(acl1),
+ wantAuth: vsecurity.NewACLAuthorizer(acl1),
},
{
flags: flagValue{"acl": "{\"veyron/alice\":\"RW\", \"veyron/bob\": \"R\"}"},
- wantAuth: security.NewACLAuthorizer(acl2),
+ wantAuth: vsecurity.NewACLAuthorizer(acl2),
},
{
flags: flagValue{"acl": "{\"veyron/bob\":\"R\", \"veyron/alice\": \"WR\"}"},
- wantAuth: security.NewACLAuthorizer(acl2),
+ wantAuth: vsecurity.NewACLAuthorizer(acl2),
},
{
flags: flagValue{"acl_file": acl2File},
- wantAuth: security.NewFileACLAuthorizer(acl2File),
+ wantAuth: vsecurity.NewFileACLAuthorizer(acl2File),
},
{
flags: flagValue{"acl_file": acl2File, "acl": "{\"veyron/alice\":\"RW\", \"veyron/bob\": \"R\"}"},
