Skip to content

Commit

Permalink
Merge branch 'master' into rpc-invalid-cache
Browse files Browse the repository at this point in the history
  • Loading branch information
@javeme
javeme authored Mar 3, 2021
2 parents 011b118 + a50c4c8 commit ec012eb
Show file tree
Hide file tree
Showing 37 changed files with 610 additions and 555 deletions.
24 changes: 12 additions & 12 deletions hugegraph-api/src/main/java/com/baidu/hugegraph/api/auth/AccessAPI.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ public String create(@Context GraphManager manager,

HugeGraph g = graph(manager, graph);
HugeAccess access = jsonAccess.build();
access.id(manager.userManager().createAccess(access));
return manager.serializer(g).writeUserElement(access);
access.id(manager.authManager().createAccess(access));
return manager.serializer(g).writeAuthElement(access);
}

@PUT
Expand All @@ -90,13 +90,13 @@ public String update(@Context GraphManager manager,
HugeGraph g = graph(manager, graph);
HugeAccess access;
try {
access = manager.userManager().getAccess(UserAPI.parseId(id));
access = manager.authManager().getAccess(UserAPI.parseId(id));
} catch (NotFoundException e) {
throw new IllegalArgumentException("Invalid access id: " + id);
}
access = jsonAccess.build(access);
manager.userManager().updateAccess(access);
return manager.serializer(g).writeUserElement(access);
manager.authManager().updateAccess(access);
return manager.serializer(g).writeAuthElement(access);
}

@GET
Expand All @@ -116,14 +116,14 @@ public String list(@Context GraphManager manager,
List<HugeAccess> belongs;
if (group != null) {
Id id = UserAPI.parseId(group);
belongs = manager.userManager().listAccessByGroup(id, limit);
belongs = manager.authManager().listAccessByGroup(id, limit);
} else if (target != null) {
Id id = UserAPI.parseId(target);
belongs = manager.userManager().listAccessByTarget(id, limit);
belongs = manager.authManager().listAccessByTarget(id, limit);
} else {
belongs = manager.userManager().listAllAccess(limit);
belongs = manager.authManager().listAllAccess(limit);
}
return manager.serializer(g).writeUserElements("accesses", belongs);
return manager.serializer(g).writeAuthElements("accesses", belongs);
}

@GET
Expand All @@ -136,8 +136,8 @@ public String get(@Context GraphManager manager,
LOG.debug("Graph [{}] get access: {}", graph, id);

HugeGraph g = graph(manager, graph);
HugeAccess access = manager.userManager().getAccess(UserAPI.parseId(id));
return manager.serializer(g).writeUserElement(access);
HugeAccess access = manager.authManager().getAccess(UserAPI.parseId(id));
return manager.serializer(g).writeAuthElement(access);
}

@DELETE
Expand All @@ -152,7 +152,7 @@ public void delete(@Context GraphManager manager,
@SuppressWarnings("unused") // just check if the graph exists
HugeGraph g = graph(manager, graph);
try {
manager.userManager().deleteAccess(UserAPI.parseId(id));
manager.authManager().deleteAccess(UserAPI.parseId(id));
} catch (NotFoundException e) {
throw new IllegalArgumentException("Invalid access id: " + id);
}
Expand Down
24 changes: 12 additions & 12 deletions hugegraph-api/src/main/java/com/baidu/hugegraph/api/auth/BelongAPI.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ public String create(@Context GraphManager manager,

HugeGraph g = graph(manager, graph);
HugeBelong belong = jsonBelong.build();
belong.id(manager.userManager().createBelong(belong));
return manager.serializer(g).writeUserElement(belong);
belong.id(manager.authManager().createBelong(belong));
return manager.serializer(g).writeAuthElement(belong);
}

@PUT
Expand All @@ -89,13 +89,13 @@ public String update(@Context GraphManager manager,
HugeGraph g = graph(manager, graph);
HugeBelong belong;
try {
belong = manager.userManager().getBelong(UserAPI.parseId(id));
belong = manager.authManager().getBelong(UserAPI.parseId(id));
} catch (NotFoundException e) {
throw new IllegalArgumentException("Invalid belong id: " + id);
}
belong = jsonBelong.build(belong);
manager.userManager().updateBelong(belong);
return manager.serializer(g).writeUserElement(belong);
manager.authManager().updateBelong(belong);
return manager.serializer(g).writeAuthElement(belong);
}

@GET
Expand All @@ -115,14 +115,14 @@ public String list(@Context GraphManager manager,
List<HugeBelong> belongs;
if (user != null) {
Id id = UserAPI.parseId(user);
belongs = manager.userManager().listBelongByUser(id, limit);
belongs = manager.authManager().listBelongByUser(id, limit);
} else if (group != null) {
Id id = UserAPI.parseId(group);
belongs = manager.userManager().listBelongByGroup(id, limit);
belongs = manager.authManager().listBelongByGroup(id, limit);
} else {
belongs = manager.userManager().listAllBelong(limit);
belongs = manager.authManager().listAllBelong(limit);
}
return manager.serializer(g).writeUserElements("belongs", belongs);
return manager.serializer(g).writeAuthElements("belongs", belongs);
}

@GET
Expand All @@ -135,8 +135,8 @@ public String get(@Context GraphManager manager,
LOG.debug("Graph [{}] get belong: {}", graph, id);

HugeGraph g = graph(manager, graph);
HugeBelong belong = manager.userManager().getBelong(UserAPI.parseId(id));
return manager.serializer(g).writeUserElement(belong);
HugeBelong belong = manager.authManager().getBelong(UserAPI.parseId(id));
return manager.serializer(g).writeAuthElement(belong);
}

@DELETE
Expand All @@ -151,7 +151,7 @@ public void delete(@Context GraphManager manager,
@SuppressWarnings("unused") // just check if the graph exists
HugeGraph g = graph(manager, graph);
try {
manager.userManager().deleteBelong(UserAPI.parseId(id));
manager.authManager().deleteBelong(UserAPI.parseId(id));
} catch (NotFoundException e) {
throw new IllegalArgumentException("Invalid belong id: " + id);
}
Expand Down
20 changes: 10 additions & 10 deletions hugegraph-api/src/main/java/com/baidu/hugegraph/api/auth/GroupAPI.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ public String create(@Context GraphManager manager,

HugeGraph g = graph(manager, graph);
HugeGroup group = jsonGroup.build();
group.id(manager.userManager().createGroup(group));
return manager.serializer(g).writeUserElement(group);
group.id(manager.authManager().createGroup(group));
return manager.serializer(g).writeAuthElement(group);
}

@PUT
Expand All @@ -89,13 +89,13 @@ public String update(@Context GraphManager manager,
HugeGraph g = graph(manager, graph);
HugeGroup group;
try {
group = manager.userManager().getGroup(UserAPI.parseId(id));
group = manager.authManager().getGroup(UserAPI.parseId(id));
} catch (NotFoundException e) {
throw new IllegalArgumentException("Invalid group id: " + id);
}
group = jsonGroup.build(group);
manager.userManager().updateGroup(group);
return manager.serializer(g).writeUserElement(group);
manager.authManager().updateGroup(group);
return manager.serializer(g).writeAuthElement(group);
}

@GET
Expand All @@ -107,8 +107,8 @@ public String list(@Context GraphManager manager,
LOG.debug("Graph [{}] list groups", graph);

HugeGraph g = graph(manager, graph);
List<HugeGroup> groups = manager.userManager().listAllGroups(limit);
return manager.serializer(g).writeUserElements("groups", groups);
List<HugeGroup> groups = manager.authManager().listAllGroups(limit);
return manager.serializer(g).writeAuthElements("groups", groups);
}

@GET
Expand All @@ -121,8 +121,8 @@ public String get(@Context GraphManager manager,
LOG.debug("Graph [{}] get group: {}", graph, id);

HugeGraph g = graph(manager, graph);
HugeGroup group = manager.userManager().getGroup(IdGenerator.of(id));
return manager.serializer(g).writeUserElement(group);
HugeGroup group = manager.authManager().getGroup(IdGenerator.of(id));
return manager.serializer(g).writeAuthElement(group);
}

@DELETE
Expand All @@ -137,7 +137,7 @@ public void delete(@Context GraphManager manager,
@SuppressWarnings("unused") // just check if the graph exists
HugeGraph g = graph(manager, graph);
try {
manager.userManager().deleteGroup(IdGenerator.of(id));
manager.authManager().deleteGroup(IdGenerator.of(id));
} catch (NotFoundException e) {
throw new IllegalArgumentException("Invalid group id: " + id);
}
Expand Down
20 changes: 10 additions & 10 deletions hugegraph-api/src/main/java/com/baidu/hugegraph/api/auth/TargetAPI.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ public String create(@Context GraphManager manager,

HugeGraph g = graph(manager, graph);
HugeTarget target = jsonTarget.build();
target.id(manager.userManager().createTarget(target));
return manager.serializer(g).writeUserElement(target);
target.id(manager.authManager().createTarget(target));
return manager.serializer(g).writeAuthElement(target);
}

@PUT
Expand All @@ -90,13 +90,13 @@ public String update(@Context GraphManager manager,
HugeGraph g = graph(manager, graph);
HugeTarget target;
try {
target = manager.userManager().getTarget(UserAPI.parseId(id));
target = manager.authManager().getTarget(UserAPI.parseId(id));
} catch (NotFoundException e) {
throw new IllegalArgumentException("Invalid target id: " + id);
}
target = jsonTarget.build(target);
manager.userManager().updateTarget(target);
return manager.serializer(g).writeUserElement(target);
manager.authManager().updateTarget(target);
return manager.serializer(g).writeAuthElement(target);
}

@GET
Expand All @@ -108,8 +108,8 @@ public String list(@Context GraphManager manager,
LOG.debug("Graph [{}] list targets", graph);

HugeGraph g = graph(manager, graph);
List<HugeTarget> targets = manager.userManager().listAllTargets(limit);
return manager.serializer(g).writeUserElements("targets", targets);
List<HugeTarget> targets = manager.authManager().listAllTargets(limit);
return manager.serializer(g).writeAuthElements("targets", targets);
}

@GET
Expand All @@ -122,8 +122,8 @@ public String get(@Context GraphManager manager,
LOG.debug("Graph [{}] get target: {}", graph, id);

HugeGraph g = graph(manager, graph);
HugeTarget target = manager.userManager().getTarget(UserAPI.parseId(id));
return manager.serializer(g).writeUserElement(target);
HugeTarget target = manager.authManager().getTarget(UserAPI.parseId(id));
return manager.serializer(g).writeAuthElement(target);
}

@DELETE
Expand All @@ -138,7 +138,7 @@ public void delete(@Context GraphManager manager,
@SuppressWarnings("unused") // just check if the graph exists
HugeGraph g = graph(manager, graph);
try {
manager.userManager().deleteTarget(UserAPI.parseId(id));
manager.authManager().deleteTarget(UserAPI.parseId(id));
} catch (NotFoundException e) {
throw new IllegalArgumentException("Invalid target id: " + id);
}
Expand Down
24 changes: 12 additions & 12 deletions hugegraph-api/src/main/java/com/baidu/hugegraph/api/auth/UserAPI.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ public String create(@Context GraphManager manager,

HugeGraph g = graph(manager, graph);
HugeUser user = jsonUser.build();
user.id(manager.userManager().createUser(user));
return manager.serializer(g).writeUserElement(user);
user.id(manager.authManager().createUser(user));
return manager.serializer(g).writeAuthElement(user);
}

@PUT
Expand All @@ -91,13 +91,13 @@ public String update(@Context GraphManager manager,
HugeGraph g = graph(manager, graph);
HugeUser user;
try {
user = manager.userManager().getUser(UserAPI.parseId(id));
user = manager.authManager().getUser(UserAPI.parseId(id));
} catch (NotFoundException e) {
throw new IllegalArgumentException("Invalid user id: " + id);
}
user = jsonUser.build(user);
manager.userManager().updateUser(user);
return manager.serializer(g).writeUserElement(user);
manager.authManager().updateUser(user);
return manager.serializer(g).writeAuthElement(user);
}

@GET
Expand All @@ -109,8 +109,8 @@ public String list(@Context GraphManager manager,
LOG.debug("Graph [{}] list users", graph);

HugeGraph g = graph(manager, graph);
List<HugeUser> users = manager.userManager().listAllUsers(limit);
return manager.serializer(g).writeUserElements("users", users);
List<HugeUser> users = manager.authManager().listAllUsers(limit);
return manager.serializer(g).writeAuthElements("users", users);
}

@GET
Expand All @@ -123,8 +123,8 @@ public String get(@Context GraphManager manager,
LOG.debug("Graph [{}] get user: {}", graph, id);

HugeGraph g = graph(manager, graph);
HugeUser user = manager.userManager().getUser(IdGenerator.of(id));
return manager.serializer(g).writeUserElement(user);
HugeUser user = manager.authManager().getUser(IdGenerator.of(id));
return manager.serializer(g).writeAuthElement(user);
}

@GET
Expand All @@ -138,8 +138,8 @@ public String role(@Context GraphManager manager,

@SuppressWarnings("unused") // just check if the graph exists
HugeGraph g = graph(manager, graph);
HugeUser user = manager.userManager().getUser(IdGenerator.of(id));
return manager.userManager().rolePermission(user).toJson();
HugeUser user = manager.authManager().getUser(IdGenerator.of(id));
return manager.authManager().rolePermission(user).toJson();
}

@DELETE
Expand All @@ -154,7 +154,7 @@ public void delete(@Context GraphManager manager,
@SuppressWarnings("unused") // just check if the graph exists
HugeGraph g = graph(manager, graph);
try {
manager.userManager().deleteUser(IdGenerator.of(id));
manager.authManager().deleteUser(IdGenerator.of(id));
} catch (NotFoundException e) {
throw new IllegalArgumentException("Invalid user id: " + id);
}
Expand Down
4 changes: 2 additions & 2 deletions hugegraph-api/src/main/java/com/baidu/hugegraph/auth/ConfigAuthenticator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ public RolePermission authenticate(final String username,
}

@Override
public UserManager userManager() {
throw new NotImplementedException("UserManager is unsupported");
public AuthManager authManager() {
throw new NotImplementedException("AuthManager is unsupported");
}

@Override
Expand Down
6 changes: 3 additions & 3 deletions hugegraph-api/src/main/java/com/baidu/hugegraph/auth/HugeAuthenticator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

import com.baidu.hugegraph.HugeException;
import com.baidu.hugegraph.auth.HugeGraphAuthProxy.Context;
import com.baidu.hugegraph.auth.SchemaDefine.UserElement;
import com.baidu.hugegraph.auth.SchemaDefine.AuthElement;
import com.baidu.hugegraph.config.HugeConfig;
import com.baidu.hugegraph.config.OptionSpace;
import com.baidu.hugegraph.config.ServerOptions;
Expand Down Expand Up @@ -64,7 +64,7 @@ public interface HugeAuthenticator extends Authenticator {
public void setup(HugeConfig config);

public RolePermission authenticate(String username, String password);
public UserManager userManager();
public AuthManager authManager();

@Override
public default void setup(final Map<String, Object> config) {
Expand Down Expand Up @@ -378,7 +378,7 @@ public static boolean match(Object role, RolePermission grant,
}

if (resourceObject != null) {
UserElement element = (UserElement) resourceObject.operated();
AuthElement element = (AuthElement) resourceObject.operated();
if (element instanceof HugeUser &&
((HugeUser) element).name().equals(USER_ADMIN)) {
// Can't access admin by other users
Expand Down
Loading

0 comments on commit ec012eb

Please sign in to comment.