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

Fixes #17596: User with some to access technique editor api #3035

Merged
merged 1 commit into from
Jun 3, 2020
Merged

Fixes #17596: User with some to access technique editor api #3035

Show file tree
Hide file tree
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...ces/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/EndpointsDefinition.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ object NodeApi extends ApiModuleProvider[NodeApi] {
val description = "Get all proporeties for that node, included inherited ones"
val (action, path) = GET / "nodes" / "{id}" / "inheritedProperties"
}
final case object ApplyPocicyAllNodes extends NodeApi with ZeroParam with StartsAtVersion8 with SortIndex { val z = implicitly[Line].value
final case object ApplyPolicyAllNodes extends NodeApi with ZeroParam with StartsAtVersion8 with SortIndex { val z = implicitly[Line].value
val description = "Ask all nodes to start a run with the given policy"
val (action, path) = POST / "nodes" / "applyPolicy"
}
Expand Down
21 changes: 14 additions & 7 deletions .../sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/RoleApiMapping.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,11 @@ final case object OnlyAdmin extends AuthorizationApiMapping {
case AnyRights => ApiAuthz.allAuthz.acl
// Administration is Rudder setting

case Administration.Read => SettingsApi.GetAllSettings.x :: SettingsApi.GetSetting.x :: SystemApi.ArchivesDirectivesList.x :: SystemApi.ArchivesFullList.x :: SystemApi.ArchivesGroupsList.x ::
SystemApi.ArchivesRulesList.x :: SystemApi.GetAllZipArchive.x :: SystemApi.GetDirectivesZipArchive.x :: SystemApi.GetGroupsZipArchive.x :: SystemApi.GetRulesZipArchive.x ::
SystemApi.Info.x :: SystemApi.Status.x :: Nil
case Administration.Read => SettingsApi.GetAllSettings.x :: SettingsApi.GetSetting.x :: SystemApi.ArchivesDirectivesList.x ::
SystemApi.ArchivesFullList.x :: SystemApi.ArchivesGroupsList.x :: SystemApi.ArchivesRulesList.x ::
SystemApi.GetAllZipArchive.x :: SystemApi.GetDirectivesZipArchive.x :: SystemApi.GetGroupsZipArchive.x ::
SystemApi.GetRulesZipArchive.x :: SystemApi.Info.x :: SystemApi.Status.x :: SystemApi.ArchivesParametersList ::
SystemApi.GetParametersZipArchive :: Nil
case Administration.Write => SettingsApi.ModifySettings.x :: SettingsApi.ModifySetting.x :: SystemApi.endpoints.map(_.x)
case Administration.Edit => SettingsApi.ModifySettings.x :: SettingsApi.ModifySetting.x :: SystemApi.endpoints.map(_.x)

Expand Down Expand Up @@ -136,18 +138,19 @@ final case object OnlyAdmin extends AuthorizationApiMapping {
case Directive.Edit => DirectiveApi.UpdateDirective.x :: Nil

case Group.Read => GroupApi.ListGroups.x :: GroupApi.GroupDetails.x :: GroupApi.GetGroupTree.x ::
GroupApi.GetGroupCategoryDetails.x :: Nil
GroupApi.GetGroupCategoryDetails.x :: GroupApi.GroupInheritedProperties :: Nil
case Group.Write => GroupApi.CreateGroup.x :: GroupApi.DeleteGroup.x :: GroupApi.ReloadGroup.x ::
GroupApi.DeleteGroupCategory.x :: GroupApi.CreateGroupCategory.x :: Nil
case Group.Edit => GroupApi.UpdateGroup.x :: GroupApi.UpdateGroupCategory.x :: Nil

case Node.Read => NodeApi.ListAcceptedNodes.x :: NodeApi.ListPendingNodes.x :: NodeApi.NodeDetails.x ::
NodeApi.NodeInheritedProperties ::
// node read also allows to read some settings
AuthzForApi.withValues(SettingsApi.GetSetting, AclPathSegment.Segment("global_policy_mode") :: Nil ) ::
AuthzForApi.withValues(SettingsApi.GetSetting, AclPathSegment.Segment("global_policy_mode_overridable") :: Nil ) ::
Nil
case Node.Write => NodeApi.DeleteNode.x :: NodeApi.ChangePendingNodeStatus.x :: NodeApi.ChangePendingNodeStatus2.x ::
NodeApi.ApplyPocicyAllNodes.x :: NodeApi.ApplyPolicy.x :: Nil
NodeApi.ApplyPolicyAllNodes.x :: NodeApi.ApplyPolicy.x :: Nil
case Node.Edit => NodeApi.UpdateNode.x :: Nil

case Rule.Read => RuleApi.ListRules.x :: RuleApi.RuleDetails.x :: RuleApi.GetRuleTree.x ::
Expand All @@ -157,9 +160,13 @@ final case object OnlyAdmin extends AuthorizationApiMapping {
case Rule.Edit => RuleApi.UpdateRule.x :: RuleApi.UpdateRuleCategory.x :: Nil

case Technique.Read => TechniqueApi.ListTechniques.x :: TechniqueApi.ListTechniquesDirectives.x ::
TechniqueApi.ListTechniqueDirectives.x :: Nil
TechniqueApi.ListTechniqueDirectives.x :: NcfApi.GetMethods.x :: NcfApi.GetTechniques.x ::
NcfApi.GetAllTechniqueCategories.x :: NcfApi.GetResources.x :: NcfApi.GetNewResources.x ::
NcfApi.ParameterCheck.x :: Nil
case Technique.Write => NcfApi.CreateTechnique.x :: SystemApi.PoliciesUpdate.x :: SystemApi.PoliciesRegenerate.x :: Nil
case Technique.Edit => NcfApi.UpdateTechnique.x :: SystemApi.PoliciesUpdate.x :: SystemApi.PoliciesRegenerate.x :: Nil
case Technique.Edit => NcfApi.UpdateTechnique.x :: SystemApi.PoliciesUpdate.x :: SystemApi.PoliciesRegenerate.x ::
NcfApi.DeleteTechnique.x :: NcfApi.UpdateTechniques.x :: NcfApi.UpdateMethods.x :: Nil


case UserAccount.Read => UserApi.GetApiToken.x :: Nil
case UserAccount.Write => Nil
Expand Down
4 changes: 2 additions & 2 deletions ...pp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/NodeApi.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ class NodeApi (
case API.DeleteNode => DeleteNode
case API.ChangePendingNodeStatus => ChangePendingNodeStatus
case API.ChangePendingNodeStatus2 => ChangePendingNodeStatus2
case API.ApplyPocicyAllNodes => ApplyPocicyAllNodes
case API.ApplyPolicyAllNodes => ApplyPocicyAllNodes
case API.UpdateNode => UpdateNode
case API.ListAcceptedNodes => ListAcceptedNodes
case API.ApplyPolicy => ApplyPolicy
Expand Down Expand Up @@ -289,7 +289,7 @@ class NodeApi (
}

object ApplyPocicyAllNodes extends LiftApiModule0 {
val schema = API.ApplyPocicyAllNodes
val schema = API.ApplyPolicyAllNodes
val restExtractor = restExtractorService
def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = {
implicit val prettify = params.prettify
Expand Down