Merge branch 'addBasicAuthConfigurationToDashboard' of git://github.c…

…om/guillaume-boivin/Taffy into guillaume-boivin-addBasicAuthConfigurationToDashboard
atuttle · Feb 9, 2015 · aeee297 · aeee297
2 parents 7da4a45 + da7dd5a
commit aeee297
Show file tree

Hide file tree

Showing 2 changed files with 155 additions and 1 deletion.
diff --git a/dashboard/dash.js b/dashboard/dash.js
@@ -69,7 +69,8 @@ $(function(){
 			,resource = submit.closest('.resource')
 			,reset = resource.find('.resetRequest')
 			,loading = resource.find('.progress')
-			,response = resource.find('.response');
+			,response = resource.find('.response')
+			,basicAuth = resource.find(".basicAuth");
 
 		//validate tokens
 		resource.find('.has-error').removeClass('has-error');
@@ -119,6 +120,13 @@ $(function(){
 				headers[ k ] = v;
 			}
 		}
+
+		var basicAuthUsername = basicAuth.find("input[name=username]").val();
+		var basicAuthPassword = basicAuth.find("input[name=password]").val();
+
+		if(basicAuthUsername.length && basicAuthPassword.length){
+			headers["Authorization"] =  "Basic " + Base64.encode(basicAuthUsername + ":" + basicAuthPassword);
+		}
 
 		submitRequest(verb, path, headers, body, function(timeSpent, status, headers, body){
 			loading.hide();
@@ -242,3 +250,143 @@ String.prototype.supplant = function (o) {
     );
 };
 
+/**
+*
+*  Base64 encode / decode
+*  http://www.webtoolkit.info/
+*
+**/
+var Base64 = {
+
+	// private property
+	_keyStr : "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=",
+
+	// public method for encoding
+	encode : function (input) {
+	    var output = "";
+	    var chr1, chr2, chr3, enc1, enc2, enc3, enc4;
+	    var i = 0;
+
+	    input = Base64._utf8_encode(input);
+
+	    while (i < input.length) {
+
+	        chr1 = input.charCodeAt(i++);
+	        chr2 = input.charCodeAt(i++);
+	        chr3 = input.charCodeAt(i++);
+
+	        enc1 = chr1 >> 2;
+	        enc2 = ((chr1 & 3) << 4) | (chr2 >> 4);
+	        enc3 = ((chr2 & 15) << 2) | (chr3 >> 6);
+	        enc4 = chr3 & 63;
+
+	        if (isNaN(chr2)) {
+	            enc3 = enc4 = 64;
+	        } else if (isNaN(chr3)) {
+	            enc4 = 64;
+	        }
+
+	        output = output +
+	        this._keyStr.charAt(enc1) + this._keyStr.charAt(enc2) +
+	        this._keyStr.charAt(enc3) + this._keyStr.charAt(enc4);
+
+	    }
+
+	    return output;
+	},
+
+	// public method for decoding
+	decode : function (input) {
+	    var output = "";
+	    var chr1, chr2, chr3;
+	    var enc1, enc2, enc3, enc4;
+	    var i = 0;
+
+	    input = input.replace(/[^A-Za-z0-9\+\/\=]/g, "");
+
+	    while (i < input.length) {
+
+	        enc1 = this._keyStr.indexOf(input.charAt(i++));
+	        enc2 = this._keyStr.indexOf(input.charAt(i++));
+	        enc3 = this._keyStr.indexOf(input.charAt(i++));
+	        enc4 = this._keyStr.indexOf(input.charAt(i++));
+
+	        chr1 = (enc1 << 2) | (enc2 >> 4);
+	        chr2 = ((enc2 & 15) << 4) | (enc3 >> 2);
+	        chr3 = ((enc3 & 3) << 6) | enc4;
+
+	        output = output + String.fromCharCode(chr1);
+
+	        if (enc3 != 64) {
+	            output = output + String.fromCharCode(chr2);
+	        }
+	        if (enc4 != 64) {
+	            output = output + String.fromCharCode(chr3);
+	        }
+
+	    }
+
+	    output = Base64._utf8_decode(output);
+
+	    return output;
+
+	},
+
+	// private method for UTF-8 encoding
+	_utf8_encode : function (string) {
+	    string = string.replace(/\r\n/g,"\n");
+	    var utftext = "";
+
+	    for (var n = 0; n < string.length; n++) {
+
+	        var c = string.charCodeAt(n);
+
+	        if (c < 128) {
+	            utftext += String.fromCharCode(c);
+	        }
+	        else if((c > 127) && (c < 2048)) {
+	            utftext += String.fromCharCode((c >> 6) | 192);
+	            utftext += String.fromCharCode((c & 63) | 128);
+	        }
+	        else {
+	            utftext += String.fromCharCode((c >> 12) | 224);
+	            utftext += String.fromCharCode(((c >> 6) & 63) | 128);
+	            utftext += String.fromCharCode((c & 63) | 128);
+	        }
+
+	    }
+
+	    return utftext;
+	},
+
+	// private method for UTF-8 decoding
+	_utf8_decode : function (utftext) {
+	    var string = "";
+	    var i = 0;
+	    var c = c1 = c2 = 0;
+
+	    while ( i < utftext.length ) {
+
+	        c = utftext.charCodeAt(i);
+
+	        if (c < 128) {
+	            string += String.fromCharCode(c);
+	            i++;
+	        }
+	        else if((c > 191) && (c < 224)) {
+	            c2 = utftext.charCodeAt(i+1);
+	            string += String.fromCharCode(((c & 31) << 6) | (c2 & 63));
+	            i += 2;
+	        }
+	        else {
+	            c2 = utftext.charCodeAt(i+1);
+	            c3 = utftext.charCodeAt(i+2);
+	            string += String.fromCharCode(((c & 15) << 12) | ((c2 & 63) << 6) | (c3 & 63));
+	            i += 3;
+	        }
+
+	    }
+
+	    return string;
+	}
+}
diff --git a/dashboard/dashboard.cfm b/dashboard/dashboard.cfm
@@ -298,6 +298,12 @@
 													><cfloop list="#structKeyList(application._taffy.settings.dashboardHeaders, '|')#" delimiters="|" index="k">#k#: #application._taffy.settings.dashboardHeaders[k]##chr(13)##chr(10)#</cfloop></textarea>
 											</div>
 
+											<h4>Basic Auth:</h4>
+											<div class="basicAuth row">
+											  	<div class="col-md-6"><input type="text" name="username" class="form-control" placeholder="Username" value="" /></div>
+											  	<div class="col-md-6"><input type="text" name="password" class="form-control" placeholder="Password" value="" /></div>
+											</div>
+
 											<div class="reqBody">
 												<h4>Request Body:</h4>
 												<textarea id="#local.resourceHTTPID#_RequestBody" class="form-control input-sm" rows="5"></textarea>