[FIXED JENKINS-33872] User should be able to view their own credentials

jenkinsci · May 23, 2016 · db3664c · db3664c
1 parent da3149f
commit db3664c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 43 deletions.
diff --git a/src/main/java/com/cloudbees/plugins/credentials/UserCredentialsProvider.java b/src/main/java/com/cloudbees/plugins/credentials/UserCredentialsProvider.java
@@ -382,7 +382,7 @@ private synchronized boolean addCredentials(@NonNull Domain domain, @NonNull Cre
         @NonNull
         private synchronized List<Credentials> getCredentials(@NonNull Domain domain) {
             // TODO switch to Jenkins.getInstance() once 2.0+ is the baseline
-            if (Jenkins.getActiveInstance().hasPermission(CredentialsProvider.VIEW)) {
+            if (user.equals(User.current())) {
                 List<Credentials> list = getDomainCredentialsMap().get(domain);
                 if (list == null || list.isEmpty()) {
                     return Collections.emptyList();
@@ -460,12 +460,6 @@ private void save() throws IOException {
          */
         @Override
         public UserProperty reconfigure(StaplerRequest req, JSONObject form) throws Descriptor.FormException {
-            User selUser = req.findAncestorObject(User.class);
-            User curUser = User.current();
-            // only process changes to this property for the current user
-            if (selUser != null && curUser != null && selUser.getId().equals(curUser.getId())) {
-                return getDescriptor().newInstance(req, form);
-            }
             return this;
         }
 
@@ -500,28 +494,6 @@ public String getDisplayName() {
                 return Messages.UserCredentialsProvider_DisplayName();
             }
 
-            /**
-             * Whether the credentials should be visible on the user's configure screen.
-             *
-             * @return true if and only if the current request is the current user's configuration screen.
-             */
-            @SuppressWarnings("unused") // used by stapler
-            public boolean isVisible() {
-                if (!isEnabled()) {
-                    // no point bothering the user if there are no credentials aware plugins installed.
-                    return false;
-                }
-                StaplerRequest req = Stapler.getCurrentRequest();
-                if (req == null) {
-                    // does not make sense to pretend to be enabled outside of a stapler request
-                    return false;
-                }
-                User selUser = req.findAncestorObject(User.class);
-                User curUser = User.current();
-                // only enable this property for the current user
-                return selUser != null && curUser != null && selUser.equals(curUser);
-            }
-
             /**
              * Gets all the credentials descriptors.
              *

diff --git a/...loudbees/plugins/credentials/UserCredentialsProvider/UserCredentialsProperty/config.jelly b/...loudbees/plugins/credentials/UserCredentialsProvider/UserCredentialsProperty/config.jelly
@@ -24,18 +24,16 @@
  -->
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form" xmlns:c="/lib/credentials">
-  <j:invokeStatic var="allCredentials" className="com.cloudbees.plugins.credentials.CredentialsProvider"
-                  method="allCredentialsDescriptors"/>
-  <j:if test="${descriptor.visible}">
-    <f:block>
-      <c:domainCredentials name="domainCredentials" domainCredentials="${instance.domainCredentials}"
-                           specificationDescriptors="${descriptor.specificationDescriptors}"
-                           credentialDescriptors="${instance.credentialDescriptors}"/>
-    </f:block>
-  </j:if>
-  <j:if test="${!descriptor.visible}">
-    <f:block>
-      ${%Credentials are only available to the user they belong to}
-    </f:block>
-  </j:if>
+  <j:choose>
+    <j:when test="${descriptor.visible}">
+      <f:block>
+        ${%blurb}
+      </f:block>
+    </j:when>
+    <j:otherwise>
+      <f:block>
+        ${%Credentials are only available to the user they belong to}
+      </f:block>
+    </j:otherwise>
+  </j:choose>
 </j:jelly>
diff --git a/...ees/plugins/credentials/UserCredentialsProvider/UserCredentialsProperty/config.properties b/...ees/plugins/credentials/UserCredentialsProvider/UserCredentialsProperty/config.properties
@@ -0,0 +1 @@
+blurb=Credentials are managed from the <a href="credentials/store/user">Credentials</a> screen.