From b1f297aa7ba8cbb6b3c166d4e40dc0c116c18d63 Mon Sep 17 00:00:00 2001 From: Hamza Zia Date: Wed, 6 Jun 2012 14:17:55 +0800 Subject: [PATCH] http authentication hack added for JSONP !!!! --- index.html | 10 ++++++++++ js/script.js | 30 ++++++++++++++++++++++++++---- 2 files changed, 36 insertions(+), 4 deletions(-) diff --git a/index.html b/index.html index bb51cda..72fee1e 100755 --- a/index.html +++ b/index.html @@ -182,6 +182,16 @@

Enter the port of the server on which the rpc for aria2 is running (default = 6800)

+ +
+ +

Enter the username of the server on which the rpc for aria2 is running (empty if authentication not enabled)

+
+ +
+ +

Enter the password of the server on which the rpc for aria2 is running (empty if authentication not enabled)

+
diff --git a/js/script.js b/js/script.js index b4aacb2..36f8f7b 100755 --- a/js/script.js +++ b/js/script.js @@ -11,15 +11,26 @@ var clear_dialogs = function() { }; var server_conf = { host: 'localhost', - port: 6800 + port: 6800, + user: "", + pass: "" }; var custom_aria2_connect = function() { modals.err_connect.modal('hide'); modals.change_conf.modal('show'); }; var update_server_conf = function() { - server_conf.host = $('#input_host').val(); - server_conf.port = $('#input_port').val(); + var host = $('#input_host').val().trim(); + var port = $('#input_port').val().trim(); + server_conf.user = $('#input_user').val().trim(); + server_conf.pass = $('#input_pass').val().trim(); + if(host.length !== 0) { + server_conf.host = host; + } + if(port.length !== 0) { + server_conf.port = port; + } + clear_dialogs(); update_ui(); }; @@ -31,8 +42,19 @@ function param_encode(param) { return param; } var aria_syscall = function(conf, multicall) { + var url = ""; + if(server_conf.user.length) { + url = 'http://' + + server_conf.user + ":" + + server_conf.pass + "@" + + server_conf.host + ':' + + server_conf.port + '/jsonrpc'; + } + else { + url = 'http://' + server_conf.host + ':' + server_conf.port + '/jsonrpc'; + } $.ajax({ - url: 'http://' + server_conf.host + ':' + server_conf.port + '/jsonrpc', + url: url, timeout: 1000, data: { jsonrpc: 2.0,