Avoid runtime error for some dockerconfigjson secrets

Author: spadgett

app/scripts/services/secrets.js

@@ -28,82 +28,42 @@ angular.module("openshiftConsole")
       return secretsByType;
     };
 
-    var handleDecodeException = function(error, encodedStringType) {
-      NotificationsService.addNotification({
-        type: "error",
-        message: 'Base64-encoded ' + encodedStringType + ' string could not be decoded.',
-        details: $filter('getErrorDetails')(error)
+    var decodeDockercfg = function(encodedData) {
+      var decodedSecretData = {
+        auths: {}
+      };
+      var decodedData = JSON.parse(window.atob(encodedData));
+      _.each(decodedData, function(data, serverName) {
+        decodedSecretData.auths[serverName] = {
+          username: data.username,
+          password: data.password,
+          email: data.email
+        };
       });
       Logger.error('Base64-encoded ' + encodedStringType + ' string could not be decoded.', error);
     };
 
-    var getServerParams = function(serverData) {
-      var params = _.pick(serverData, ['email', 'username', 'password']);
-      if (serverData.auth) {
-        try {
-          // Decode Base64-encoded username:password string.
-          var setParams = _.spread(function(username, password) {
-            params.username = username;
-            params.password = password;
-          });
-          setParams(_.split(window.atob(serverData.auth), ':', 2));
-        } catch(e) {
-          handleDecodeException(e, 'username:password');
-          return;
-        }
-      }
-      return params;
-    };
-
-    // decodeDockerConfig handles both Docker configuration file formats, which are:
-    //  - .dockercfg
-    //    {
-    //      "auths": {
-    //        "https://index.docker.io/v1/": {
-    //          "auth": "dGVzdHVzZXI6dGVzdHB3",
-    //          "email": "[email protected]"
-    //        }
-    //      }
-    //    }
-    //
-    //  - .dockerconfigjson
-    //    {
-    //      "auths": {
-    //        "https://index.docker.io/v1/": {
-    //          "auth": "dGVzdHVzZXI6dGVzdHB3",
-    //          "email": "[email protected]"
-    //        }
-    //      }
-    //    }
-    //
-    var decodeDockerConfig = function(encodedData, configType) {
-      var decodedData;
+    var decodeDockerconfigjson = function(encodedData) {
       var decodedSecretData = {
         auths: {}
       };
+      var decodedData = JSON.parse(window.atob(encodedData));
+      _.each(decodedData.auths, function(data, serverName) {
+        if (!data.auth) {
+          decodedSecretData.auths[serverName] = data;
+          return;
+        }
 
-      try {
-        decodedData = JSON.parse(window.atob(encodedData));
-      } catch(e) {
-        handleDecodeException(e, configType);
-      }
-
-      if (decodedData.auths) {
-        _.each(decodedData.auths, function(serverData, serverName) {
-          if (!serverData.auth) {
-            decodedSecretData.auths[serverName] = serverData;
-            return;
-          }
-          decodedSecretData.auths[serverName] = getServerParams(serverData);
-        });
+        var usernamePassword = window.atob(data.auth).split(":");
+        decodedSecretData.auths[serverName] = {
+          username: usernamePassword[0],
+          password: usernamePassword[1],
+          email: data.email
+        };
+      });
 
-        if (decodedData.credsStore) {
-          decodedSecretData.credsStore = decodedData.credsStore;
-        }
-      } else {
-        _.each(decodedData, function(serverData, serverName) {
-          decodedSecretData.auths[serverName] = getServerParams(serverData);
-        });
+      if (decodedData.credsStore) {
+        decodedSecretData.credsStore = decodedData.credsStore;
       }
 
       return decodedSecretData;

dist/scripts/scripts.js

@@ -5796,24 +5796,30 @@ message: null
 };
 }), angular.module("openshiftConsole").factory("SecretsService", function() {
 var e = function(e) {
-var t = {}, n = JSON.parse(window.atob(e));
+var t = {
+auths: {}
+}, n = JSON.parse(window.atob(e));
 return _.each(n, function(e, n) {
-t[n] = {
+t.auths[n] = {
 username: e.username,
 password: e.password,
 email: e.email
 };
 }), t;
 }, t = function(e) {
-var t = {}, n = JSON.parse(window.atob(e));
+var t = {
+auths: {}
+}, n = JSON.parse(window.atob(e));
 return _.each(n.auths, function(e, n) {
+if (e.auth) {
 var a = window.atob(e.auth).split(":");
-t[n] = {
+t.auths[n] = {
 username: a[0],
 password: a[1],
 email: e.email
 };
-}), t;
+} else t.auths[n] = e;
+}), n.credsStore && (t.credsStore = n.credsStore), t;
 };
 return {
 groupSecretsByType: function(e) {

dist/scripts/templates.js

@@ -130,22 +130,38 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
   $templateCache.put('views/_config-file-params.html',
     "<div ng-repeat=\"(serverName, data) in secretData.auths\" class=\"image-source-item\">\n" +
     "<h3>{{serverName}}</h3>\n" +
+<<<<<<< 2c46e612e12d74ae5c1c179bf8cfa5f66c483b57
     "<dt ng-if-start=\"data.username\" translate>username</dt>\n" +
     "<dd ng-if-end class=\"word-break\">{{data.username}}</dd>\n" +
     "<dt ng-if-start=\"data.password\" translate>password</dt>\n" +
+=======
+    "<dt ng-if-start=\"data.username\">username</dt>\n" +
+    "<dd ng-if-end class=\"word-break\">{{data.username}}</dd>\n" +
+    "<dt ng-if-start=\"data.password\">password</dt>\n" +
+>>>>>>> Avoid runtime error for some dockerconfigjson secrets
     "<dd ng-if-end>\n" +
     "<span ng-if=\"view.showSecret\">\n" +
     "<copy-to-clipboard clipboard-text=\"data.password\" display-wide=\"true\"></copy-to-clipboard>\n" +
     "</span>\n" +
     "<span ng-if=\"!view.showSecret\">*****</span>\n" +
     "</dd>\n" +
+<<<<<<< 2c46e612e12d74ae5c1c179bf8cfa5f66c483b57
     "<dt ng-if-start=\"data.email\" translate>email</dt>\n" +
     "<dd ng-if-end class=\"word-break\">{{data.email}}</dd>\n" +
     "<div ng-if=\"!data.username && !data.password && !data.email\" translate>\n" +
     "No username and password.\n" +
     "</div>\n" +
     "</div>\n" +
     "<h3 ng-if-start=\"secretData.credsStore\" translate>Credentials Store</h3>\n" +
+=======
+    "<dt ng-if-start=\"data.email\">email</dt>\n" +
+    "<dd ng-if-end class=\"word-break\">{{data.email}}</dd>\n" +
+    "<div ng-if=\"!data.username && !data.password && !data.email\">\n" +
+    "No username and password.\n" +
+    "</div>\n" +
+    "</div>\n" +
+    "<h3 ng-if-start=\"secretData.credsStore\">Credentials Store</h3>\n" +
+>>>>>>> Avoid runtime error for some dockerconfigjson secrets
     "<div ng-if-end>\n" +
     "<span ng-if=\"view.showSecret\">\n" +
     "<copy-to-clipboard clipboard-text=\"secretData.credsStore\" display-wide=\"true\"></copy-to-clipboard>\n" +