CQI Prevent NPE in authenticators if password is null

Author: nfalco79

src/main/java/com/cloudbees/jenkins/plugins/bitbucket/credentials/BitbucketAccessTokenAuthenticator.java

@@ -58,7 +58,7 @@ public BitbucketAccessTokenAuthenticator(StringCredentials credentials) {
      * @param request to configure with the access token
      */
     public void configureRequest(HttpRequest request) {
-        request.setHeader(HttpHeaders.AUTHORIZATION, "Bearer " + token.getPlainText());
+        request.setHeader(HttpHeaders.AUTHORIZATION, "Bearer " + Secret.toString(token));
     }
 
     /**
@@ -73,7 +73,7 @@ public void configureRequest(HttpRequest request) {
     @Override
     public StandardUsernameCredentials getCredentialsForSCM() {
         try {
-            return new UsernamePasswordCredentialsImpl(CredentialsScope.GLOBAL, getId(), null, "x-token-auth", token.getPlainText());
+            return new UsernamePasswordCredentialsImpl(CredentialsScope.GLOBAL, getId(), null, "x-token-auth", Secret.toString(token));
         } catch (FormException e) {
             throw new RuntimeException(e);
         }

src/main/java/com/cloudbees/jenkins/plugins/bitbucket/credentials/BitbucketClientCertificateAuthenticator.java

@@ -72,7 +72,7 @@ public void configureBuilder(HttpClientBuilder builder) {
 
     private SSLContext buildSSLContext() throws NoSuchAlgorithmException, KeyStoreException, UnrecoverableKeyException, KeyManagementException {
         SSLContextBuilder contextBuilder = SSLContexts.custom();
-        contextBuilder.loadKeyMaterial(keyStore, password.getPlainText().toCharArray());
+        contextBuilder.loadKeyMaterial(keyStore, Secret.toString(password).toCharArray());
         return contextBuilder.build();
     }
 

src/main/java/com/cloudbees/jenkins/plugins/bitbucket/credentials/BitbucketUsernamePasswordAuthenticator.java

@@ -27,6 +27,7 @@
 
 import com.cloudbees.jenkins.plugins.bitbucket.api.BitbucketAuthenticator;
 import com.cloudbees.plugins.credentials.common.StandardUsernamePasswordCredentials;
+import hudson.util.Secret;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.apache.http.HttpHost;
@@ -55,8 +56,8 @@ public class BitbucketUsernamePasswordAuthenticator implements BitbucketAuthenti
      */
     public BitbucketUsernamePasswordAuthenticator(StandardUsernamePasswordCredentials credentials) {
         credentialsId = credentials.getId();
-        httpCredentials = new UsernamePasswordCredentials(credentials.getUsername(),
-                credentials.getPassword().getPlainText());
+        String password = Secret.toString(credentials.getPassword());
+        httpCredentials = new UsernamePasswordCredentials(credentials.getUsername(), password);
     }
 
     /**