From 5b94be22466c8c6e89f207c66527d9c0b122ce47 Mon Sep 17 00:00:00 2001
From: Lukas Fleischer <lfleischer@calcurse.org>
Date: Wed, 8 Nov 2017 21:53:46 +0100
Subject: Revert "calcurse-caldav: Add --password command line argument"
This reverts commit efd76a0d995292e48f5466fccada4901618f7d97.
Passing passwords as command line arguments is not a good idea, since
they may appear in process listings which are potentially visible to
other users logged into the system.
Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
---
contrib/caldav/calcurse-caldav.py | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
(limited to 'contrib')
diff --git a/contrib/caldav/calcurse-caldav.py b/contrib/caldav/calcurse-caldav.py
index bc6d714..7519af3 100755
--- a/contrib/caldav/calcurse-caldav.py
+++ b/contrib/caldav/calcurse-caldav.py
@@ -489,9 +489,6 @@ parser.add_argument('--syncdb', action='store', dest='syncdbfn',
parser.add_argument('--hookdir', action='store', dest='hookdir',
default=hookdir,
help='path to the calcurse-caldav hooks directory')
-parser.add_argument('--password', action='store', dest='password',
- default=None,
- help='password for basic authentication')
parser.add_argument('--authcode', action='store', dest='authcode',
default=None,
help='auth code for OAuth2 authentication')
@@ -507,7 +504,6 @@ configfn = args.configfn
lockfn = args.lockfn
syncdbfn = args.syncdbfn
hookdir = args.hookdir
-password = args.password
authcode = args.authcode
verbose = args.verbose
debug = args.debug
@@ -567,8 +563,10 @@ if config.has_option('Auth', 'UserName'):
else:
username = None
-if config.has_option('Auth', 'Password') and not password:
+if config.has_option('Auth', 'Password'):
password = config.get('Auth', 'Password')
+else:
+ password = None
if config.has_section('CustomHeaders'):
custom_headers = dict(config.items('CustomHeaders'))
--
cgit v1.2.3-70-g09d2