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

auth: make VAR permission don't depend on VERTEX permission #1386

Merged
merged 1 commit into from
Mar 11, 2021
+25 −17
Merged

auth: make VAR permission don't depend on VERTEX permission #1386

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 25 additions & 17 deletions hugegraph-core/src/main/java/com/baidu/hugegraph/variables/HugeVariables.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
import org.slf4j.Logger;

import com.baidu.hugegraph.HugeGraph;
import com.baidu.hugegraph.HugeGraphParams;
import com.baidu.hugegraph.backend.query.Condition;
import com.baidu.hugegraph.backend.query.ConditionQuery;
Expand Down Expand Up @@ -103,15 +102,13 @@ public class HugeVariables implements Graph.Variables {
};

private final HugeGraphParams params;
private final HugeGraph graph;

public HugeVariables(HugeGraphParams params) {
this.params = params;
this.graph = params.graph();
}

public synchronized void initSchemaIfNeeded() {
if (this.graph.existsVertexLabel(Hidden.hide(VARIABLES))) {
if (this.params.graph().existsVertexLabel(Hidden.hide(VARIABLES))) {
// Ignore if exist
return;
}
Expand Down Expand Up @@ -167,7 +164,7 @@ public synchronized void initSchemaIfNeeded() {
Hidden.hide(VARIABLE_TYPE)};
properties = ArrayUtils.addAll(properties, TYPES);

SchemaManager schema = this.graph.schema();
SchemaManager schema = this.params.graph().schema();
VertexLabel variables = schema.vertexLabel(Hidden.hide(VARIABLES))
.properties(properties)
.usePrimaryKeyId()
Expand All @@ -181,7 +178,7 @@ public synchronized void initSchemaIfNeeded() {

private void createPropertyKey(String name, DataType dataType,
Cardinality cardinality) {
SchemaManager schema = this.graph.schema();
SchemaManager schema = this.params.graph().schema();
PropertyKey propertyKey = schema.propertyKey(name)
.dataType(dataType)
.cardinality(cardinality)
Expand Down Expand Up @@ -332,7 +329,7 @@ private void setProperty(HugeVertex vertex, String key, Object value) {
}

private void createVariableVertex(String key, Object value) {
VertexLabel vl = this.graph.vertexLabel(Hidden.hide(VARIABLES));
VertexLabel vl = this.variableVertexLabel();
GraphTransaction tx = this.params.graphTransaction();

HugeVertex vertex = HugeVertex.create(tx, null, vl);
Expand All @@ -353,23 +350,34 @@ private void removeVariableVertex(HugeVertex vertex) {
}

private HugeVertex queryVariableVertex(String key) {
ConditionQuery query = new ConditionQuery(HugeType.VERTEX);
VertexLabel vl = this.graph.vertexLabel(Hidden.hide(VARIABLES));
query.eq(HugeKeys.LABEL, vl.id());

PropertyKey pkey = this.graph.propertyKey(Hidden.hide(VARIABLE_KEY));
query.query(Condition.eq(pkey.id(), key));
query.showHidden(true);
Iterator<Vertex> vertices = this.graph.vertices(query);
GraphTransaction tx = this.params.graphTransaction();
Query query = this.createVariableQuery(key);
Iterator<Vertex> vertices = tx.queryVertices(query);
return (HugeVertex) QueryResults.one(vertices);
}

private Iterator<Vertex> queryAllVariableVertices() {
GraphTransaction tx = this.params.graphTransaction();
Query query = this.createVariableQuery(null);
Iterator<Vertex> vertices = tx.queryVertices(query);
return vertices;
}

private ConditionQuery createVariableQuery(String name) {
ConditionQuery query = new ConditionQuery(HugeType.VERTEX);
VertexLabel vl = this.graph.vertexLabel(Hidden.hide(VARIABLES));
VertexLabel vl = this.variableVertexLabel();
query.eq(HugeKeys.LABEL, vl.id());
if (name != null) {
PropertyKey pkey = this.params.graph().propertyKey(
Hidden.hide(VARIABLE_KEY));
query.query(Condition.eq(pkey.id(), name));
}
query.showHidden(true);
return this.graph.vertices(query);
return query;
}

private VertexLabel variableVertexLabel() {
return this.params.graph().vertexLabel(Hidden.hide(VARIABLES));
}

private static Object extractSingleObject(Object value) {
Expand Down