tursom/memgraph
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed merge conflicts

Browse Source
This commit is contained in:
josipmrden
2022-08-04 17:50:22 +02:00
parent b085532425
commit f625f2c21a
3 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/auth/models.cpp
View File

@@ -320,7 +320,7 @@ FineGrainedAccessHandler FineGrainedAccessHandler::Deserialize(const nlohmann::j
auto label_permissions = FineGrainedAccessPermissions::Deserialize(data["label_permissions"]);
auto edge_type_permissions = FineGrainedAccessPermissions::Deserialize(data["edge_type_permissions"]);
return {label_permissions, edge_type_permissions};
return FineGrainedAccessHandler(label_permissions, edge_type_permissions);
}
bool operator==(const FineGrainedAccessHandler &first, const FineGrainedAccessHandler &second) {
@@ -446,7 +446,7 @@ FineGrainedAccessPermissions User::GetFineGrainedAccessLabelPermissions() const
role_->fine_grained_access_handler().label_permissions().denies().end(),
std::inserter(resultDenies, resultDenies.begin()));
return FineGrainedAccessPermissions({resultGrants, resultDenies});
return FineGrainedAccessPermissions(resultGrants, resultDenies);
}
return fine_grained_access_handler_.label_permissions();
}
@@ -469,7 +469,7 @@ FineGrainedAccessPermissions User::GetFineGrainedAccessEdgeTypePermissions() con
role_->fine_grained_access_handler().edge_type_permissions().denies().end(),
std::inserter(resultDenies, resultDenies.begin()));
return FineGrainedAccessPermissions({resultGrants, resultDenies});
return FineGrainedAccessPermissions(resultGrants, resultDenies);
}
return fine_grained_access_handler_.edge_type_permissions();
}

5
src/auth/models.hpp
View File

@@ -122,8 +122,9 @@ bool operator!=(const FineGrainedAccessPermissions &first, const FineGrainedAcce
class FineGrainedAccessHandler final {
public:
FineGrainedAccessHandler(const FineGrainedAccessPermissions &labelPermissions = {},
const FineGrainedAccessPermissions &edgeTypePermissions = {});
explicit FineGrainedAccessHandler(
const FineGrainedAccessPermissions &labelPermissions = FineGrainedAccessPermissions(),
const FineGrainedAccessPermissions &edgeTypePermissions = FineGrainedAccessPermissions());
const FineGrainedAccessPermissions &label_permissions() const;
FineGrainedAccessPermissions &label_permissions();

18
src/query/frontend/ast/cypher_main_visitor.cpp
View File

@@ -1278,11 +1278,11 @@ antlrcpp::Any CypherMainVisitor::visitGrantPrivilege(MemgraphCypher::GrantPrivil
if (ctx->privilegeList()) {
for (auto *privilege : ctx->privilegeList()->privilege()) {
if (privilege->EDGE_TYPES()) {
auth->edgetypes_ = privilege->edgeTypeList()->accept(this).as<std::vector<std::string>>();
auth->edgetypes_ = std::any_cast<std::vector<std::string>>(privilege->edgeTypeList()->accept(this));
} else if (privilege->LABELS()) {
auth->labels_ = privilege->labelList()->accept(this).as<std::vector<std::string>>();
auth->labels_ = std::any_cast<std::vector<std::string>>(privilege->labelList()->accept(this));
} else {
auth->privileges_.push_back(privilege->accept(this));
auth->privileges_.push_back(std::any_cast<AuthQuery::Privilege>(privilege->accept(this)));
}
}
} else {
@@ -1302,11 +1302,11 @@ antlrcpp::Any CypherMainVisitor::visitDenyPrivilege(MemgraphCypher::DenyPrivileg
if (ctx->privilegeList()) {
for (auto *privilege : ctx->privilegeList()->privilege()) {
if (privilege->EDGE_TYPES()) {
auth->edgetypes_ = privilege->edgeTypeList()->accept(this).as<std::vector<std::string>>();
auth->edgetypes_ = std::any_cast<std::vector<std::string>>(privilege->edgeTypeList()->accept(this));
} else if (privilege->LABELS()) {
auth->labels_ = privilege->labelList()->accept(this).as<std::vector<std::string>>();
auth->labels_ = std::any_cast<std::vector<std::string>>(privilege->labelList()->accept(this));
} else {
auth->privileges_.push_back(privilege->accept(this));
auth->privileges_.push_back(std::any_cast<AuthQuery::Privilege>(privilege->accept(this)));
}
}
} else {
@@ -1326,11 +1326,11 @@ antlrcpp::Any CypherMainVisitor::visitRevokePrivilege(MemgraphCypher::RevokePriv
if (ctx->privilegeList()) {
for (auto *privilege : ctx->privilegeList()->privilege()) {
if (privilege->EDGE_TYPES()) {
auth->edgetypes_ = privilege->edgeTypeList()->accept(this).as<std::vector<std::string>>();
auth->edgetypes_ = std::any_cast<std::vector<std::string>>(privilege->edgeTypeList()->accept(this));
} else if (privilege->LABELS()) {
auth->labels_ = privilege->labelList()->accept(this).as<std::vector<std::string>>();
auth->labels_ = std::any_cast<std::vector<std::string>>(privilege->labelList()->accept(this));
} else {
auth->privileges_.push_back(privilege->accept(this));
auth->privileges_.push_back(std::any_cast<AuthQuery::Privilege>(privilege->accept(this)));
}
}
} else {