Skip to content

Commit 6cf442b

Browse files
mawinter69mawinter69
committed
fix checkstyle
1 parent 7a70e18 commit 6cf442b

File tree

4 files changed

+66
-53
lines changed

4 files changed

+66
-53
lines changed

‎pom.xml‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -23,24 +23,6 @@
2323
</license>
2424
</licenses>
2525

26-
<developers>
27-
<developer>
28-
<id>tmaurel</id>
29-
<name>Thomas Maurel</name>
30-
<timezone>+1</timezone>
31-
</developer>
32-
<developer>
33-
<id>rseguy</id>
34-
<name>Romain Seguy</name>
35-
<timezone>+1</timezone>
36-
</developer>
37-
<developer>
38-
<id>oleg_nenashev</id>
39-
<name>Oleg Nenashev</name>
40-
<email>o.v.nenashev@gmail.com</email>
41-
</developer>
42-
</developers>
43-
4426
<scm>
4527
<connection>scm:git:https://github.com/${gitHubRepo}.git</connection>
4628
<developerConnection>scm:git:git@github.com:${gitHubRepo}.git</developerConnection>

‎src/main/java/com/michelin/cio/hudson/plugins/rolestrategy/RoleBasedAuthorizationStrategy.java‎

Lines changed: 51 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@ private static Jenkins instance() {
408408
}
409409

410410
private static void checkAdminPerm() {
411-
instance().checkPermission(Jenkins.MANAGE);
411+
instance().checkPermission(Jenkins.ADMINISTER);
412412
}
413413

414414
/**
@@ -957,31 +957,60 @@ public void doGetAllRoles(@QueryParameter(fixEmpty = true) String type) throws I
957957
writer.close();
958958
}
959959

960+
/**
961+
* API method to get all SIDs and the assigned roles for a roletype.
962+
*
963+
* <p>
964+
* Example: {@code curl -X GET localhost:8080/role-strategy/strategy/getRoleAssignments?type=projectRoles}
965+
*
966+
* <p>
967+
* Returns a json with sids and roles<br>
968+
* Example:
969+
*
970+
* <pre>{@code
971+
* [
972+
* {
973+
* "name": "d032386",
974+
* "type": "USER",
975+
* "roles": ["admin"]
976+
* },
977+
* {
978+
* "name": "tester",
979+
* "type": "USER",
980+
* "roles": ["reader", "tester"]
981+
* }
982+
* ]
983+
* }</pre>
984+
*
985+
* @param type (globalRoles by default, projectRoles, slaveRoles)
986+
*
987+
* @since 2.6.0
988+
*/
960989
@GET
961990
@Restricted(NoExternalUse.class)
962991
public void doGetRoleAssignments(@QueryParameter(fixEmpty = true) String type) throws IOException {
963-
instance().checkPermission(Jenkins.SYSTEM_READ);
964-
965-
Set<PermissionEntry> sidEntries = getRoleMap(RoleType.fromString(type)).getSidEntries(true);
966-
967-
JSONArray responseJson = new JSONArray();
968-
for (PermissionEntry entry: sidEntries) {
969-
JSONObject userEntry = new JSONObject();
970-
userEntry.put("name", entry.getSid());
971-
userEntry.put("type", entry.getType().toString());
972-
JSONArray roles = new JSONArray();
973-
SortedMap<Role, Set<PermissionEntry>> rolesEntries = getGrantedRolesEntries(type);
974-
for (Map.Entry<Role, Set<PermissionEntry>> roleEntry: rolesEntries.entrySet()) {
975-
if (roleEntry.getValue().contains(entry)) {
976-
roles.add(roleEntry.getKey().getName());
977-
}
978-
}
979-
userEntry.put("roles", roles);
980-
responseJson.add(userEntry);
992+
instance().checkPermission(Jenkins.SYSTEM_READ);
993+
994+
Set<PermissionEntry> sidEntries = getRoleMap(RoleType.fromString(type)).getSidEntries(true);
995+
996+
JSONArray responseJson = new JSONArray();
997+
for (PermissionEntry entry : sidEntries) {
998+
JSONObject userEntry = new JSONObject();
999+
userEntry.put("name", entry.getSid());
1000+
userEntry.put("type", entry.getType().toString());
1001+
JSONArray roles = new JSONArray();
1002+
SortedMap<Role, Set<PermissionEntry>> rolesEntries = getGrantedRolesEntries(type);
1003+
for (Map.Entry<Role, Set<PermissionEntry>> roleEntry : rolesEntries.entrySet()) {
1004+
if (roleEntry.getValue().contains(entry)) {
1005+
roles.add(roleEntry.getKey().getName());
1006+
}
9811007
}
982-
Writer writer = Stapler.getCurrentResponse2().getWriter();
983-
responseJson.write(writer);
984-
writer.close();
1008+
userEntry.put("roles", roles);
1009+
responseJson.add(userEntry);
1010+
}
1011+
Writer writer = Stapler.getCurrentResponse2().getWriter();
1012+
responseJson.write(writer);
1013+
writer.close();
9851014
}
9861015

9871016
/**

‎src/main/java/com/michelin/cio/hudson/plugins/rolestrategy/RoleStrategyConfig.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ public AuthorizationStrategy getStrategy() {
156156
@RequirePOST
157157
@Restricted(NoExternalUse.class)
158158
public void doRolesSubmit(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
159-
Jenkins.get().checkPermission(Jenkins.MANAGE);
159+
Jenkins.get().checkPermission(Jenkins.ADMINISTER);
160160
// Let the strategy descriptor handle the form
161161
RoleBasedAuthorizationStrategy.DESCRIPTOR.doRolesSubmit(req, rsp);
162162
// Redirect to the plugin index page
@@ -169,7 +169,7 @@ public void doRolesSubmit(StaplerRequest2 req, StaplerResponse2 rsp) throws IOEx
169169
@RequirePOST
170170
@Restricted(NoExternalUse.class)
171171
public void doTemplatesSubmit(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
172-
Jenkins.get().checkPermission(Jenkins.MANAGE);
172+
Jenkins.get().checkPermission(Jenkins.ADMINISTER);
173173
// Let the strategy descriptor handle the form
174174
RoleBasedAuthorizationStrategy.DESCRIPTOR.doTemplatesSubmit(req, rsp);
175175
// Redirect to the plugin index page
@@ -193,7 +193,7 @@ public void doTemplatesSubmit(StaplerRequest2 req, StaplerResponse2 rsp) throws
193193
@RequirePOST
194194
@Restricted(NoExternalUse.class)
195195
public void doAssignSubmit(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
196-
Jenkins.get().checkPermission(Jenkins.MANAGE);
196+
Jenkins.get().checkPermission(Jenkins.ADMINISTER);
197197
// Let the strategy descriptor handle the form
198198

199199
String rm = req.getParameter("rolesMapping");

‎src/main/resources/com/michelin/cio/hudson/plugins/rolestrategy/RoleStrategyConfig/assign-global-roles.jelly‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,20 @@
3030
<j:set var="globalGrantedRoles" value="${it.strategy.getGrantedRolesEntries(it.strategy.GLOBAL)}"/>
3131
<j:set var="globalSIDs" value="${it.strategy.getSidEntries(it.strategy.GLOBAL)}"/>
3232

33-
<div id="globalUserInputFilter" data-table-id="${tableid}" data-initial-size="${globalSIDs.size()}" class="user-filter">
34-
<f:entry title="${%Filter by User/Group}">
35-
<input id="globalUserInput" class="user-input-filter jenkins-input setting-input" data-table-id="${tableid}"/>
36-
</f:entry>
37-
</div>
38-
<div id="globalRoleInputFilter" data-table-id="${tableid}" data-initial-size="${globalGrantedRoles.size()}" class="role-filter">
39-
<f:entry title="${%Filter by Role}">
40-
<input id="globalRoleInput" class="role-input-filter jenkins-input setting-input" data-table-id="${tableid}"/>
41-
</f:entry>
42-
</div>
4333

4434
<local:table id="${tableid}" roles="${globalGrantedRoles}" showPattern="false" template="newGlobalRowTemplate" highlighter="globalTableHighlighter">
35+
<j:if test="${rspMode == 'rsp-filters'}">
36+
<div id="globalUserInputFilter" data-table-id="${tableid}" data-initial-size="${globalSIDs.size()}" class="user-filter">
37+
<f:entry title="${%Filter by User/Group}">
38+
<input id="globalUserInput" class="user-input-filter jenkins-input setting-input" data-table-id="${tableid}"/>
39+
</f:entry>
40+
</div>
41+
<div id="globalRoleInputFilter" data-table-id="${tableid}" data-initial-size="${globalGrantedRoles.size()}" class="role-filter">
42+
<f:entry title="${%Filter by Role}">
43+
<input id="globalRoleInput" class="role-input-filter jenkins-input setting-input" data-table-id="${tableid}"/>
44+
</f:entry>
45+
</div>
46+
</j:if>
4547
<j:if test="${rspMode == 'rsp-navigation'}">
4648
<template id="newGlobalRowTemplate">
4749
<tr class="permission-row highlight-row" data-descriptor-url="${descriptorPath}">

0 commit comments

Comments
 (0)