summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYaohan Chen <yaohan.chen@gmail.com>2014-04-04 11:13:02 -0400
committerYaohan Chen <yaohan.chen@gmail.com>2014-04-05 00:08:29 -0400
commita282b78c31be363a4fa5869c59588aa39da57b88 (patch)
treed4b9f08a4275f4ec4b76802c46abc7a3650d46a7
parent1a0ddd61b8d9a6116fd4e184da61dc028a83c034 (diff)
downloadhib-dlagent-a282b78c31be363a4fa5869c59588aa39da57b88.tar.gz
hib-dlagent-a282b78c31be363a4fa5869c59588aa39da57b88.zip
Make PhantomJS read password from environment
This way the password is not included in the command line of the phantomjs process.
-rw-r--r--discover-url.coffee4
-rwxr-xr-xhib-dlagent3
2 files changed, 5 insertions, 2 deletions
diff --git a/discover-url.coffee b/discover-url.coffee
index 4dbc66b..bd7bcba 100644
--- a/discover-url.coffee
+++ b/discover-url.coffee
@@ -1,5 +1,7 @@
system = require 'system'
-[_, listing_page, filename, username, password] = system.args
+[_, listing_page, filename, username] = system.args
+password = system.env.PASSWORD
+system.env.PASSWORD = ''
util = require './util'
page = util.page
diff --git a/hib-dlagent b/hib-dlagent
index 0396633..9863a2e 100755
--- a/hib-dlagent
+++ b/hib-dlagent
@@ -20,9 +20,10 @@ STORAGE=
discover_url() {
local LISTING_PAGE="$1"
# Running a new shell in order to split PHANTOM_JS_OPTIONS into multiple arguments
+ PASSWORD="$PASSWORD" \
sh -c "phantomjs --config='$CONFIG_PATH'/phantomjs-config.json --cookies-file='$COOKIE_JAR' \
$PHANTOM_JS_OPTIONS \
- '$SCRIPT_PATH'/discover-url.coffee '$LISTING_PAGE' '$FILE' '$USERNAME' '$PASSWORD'"
+ '$SCRIPT_PATH'/discover-url.coffee '$LISTING_PAGE' '$FILE' '$USERNAME'"
}
usage() {