summaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorEvangelos Foutras <evangelos@foutrelis.com>2015-12-31 03:25:41 +0200
committerEvangelos Foutras <evangelos@foutrelis.com>2015-12-31 03:26:35 +0200
commite4381ff3b71062d49fbb8c267c6b1b4f9ce517fd (patch)
tree7767379143766066259930b244ab9548e9fc80ed /main
parent38684410ee23535741c61c32a7d89ef4950bc1fd (diff)
downloadarchweb-e4381ff3b71062d49fbb8c267c6b1b4f9ce517fd.tar.gz
archweb-e4381ff3b71062d49fbb8c267c6b1b4f9ce517fd.zip
Allow linking to the PGP server over HTTPS
Signed-off-by: Evangelos Foutras <evangelos@foutrelis.com>
Diffstat (limited to 'main')
-rw-r--r--main/templatetags/pgp.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/main/templatetags/pgp.py b/main/templatetags/pgp.py
index 455e8f9c..16b63232 100644
--- a/main/templatetags/pgp.py
+++ b/main/templatetags/pgp.py
@@ -36,8 +36,10 @@ def pgp_key_link(key_id, link_text=None):
pgp_server = getattr(settings, 'PGP_SERVER', None)
if not pgp_server:
return format_key(key_id)
- url = 'http://%s/pks/lookup?op=vindex&amp;fingerprint=on&amp;exact=on&amp;search=0x%s' % \
- (pgp_server, key_id)
+ pgp_server_secure = getattr(settings, 'PGP_SERVER_SECURE', False)
+ scheme = 'https' if pgp_server_secure else 'http'
+ url = '%s://%s/pks/lookup?op=vindex&amp;fingerprint=on&amp;exact=on&amp;search=0x%s' % \
+ (scheme, pgp_server, key_id)
if link_text is None:
link_text = '0x%s' % key_id[-8:]
values = (url, format_key(key_id), link_text)