Skip to content

Commit 89ab9fb

Browse files
committed
Manually merge PR179 to fix a regression in PR171 to get automatic filling of pubkey+cert fingerprints in MiGserver.conf functional again. We recommend checking out the new automation using fingerprint files with update bound to certificate renewal in the migcheckssl cron job instead now, but this should make the default static fill work again. Please refer to the comments in migrid issue 167 for details on the current fingerprint possibilities.
git-svn-id: svn+ssh://svn.code.sf.net/p/migrid/code/trunk@6196 b75ad72c-e7d7-11dd-a971-7dbc132099af
1 parent 4d7344d commit 89ab9fb

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

mig/shared/install.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1953,13 +1953,13 @@ def _generate_confs_prepare(
19531953
raw_sha256 = openssl_proc.stdout.read().strip()
19541954
# NOTE: openssl outputs something like 'SHA256 Fingerprint=BLA'
19551955
# but algo part case may vary - split and take last part.
1956-
daemon_keycert_sha256 = raw_sha256.split(" Fingerprint=", 1)[-1]
1956+
cur_keycert_sha256 = raw_sha256.split(" Fingerprint=", 1)[-1]
19571957
except Exception as exc:
19581958
print("ERROR: failed to extract sha256 fingerprint of %s: %s" %
19591959
(key_path, exc))
1960-
daemon_keycert_sha256 = ''
1960+
cur_keycert_sha256 = ''
19611961
if daemon_keycert_sha256 == keyword_auto:
1962-
user_dict['__DAEMON_KEYCERT_SHA256__'] = daemon_keycert_sha256
1962+
user_dict['__DAEMON_KEYCERT_SHA256__'] = cur_keycert_sha256
19631963
if user_dict['__DAEMON_PUBKEY__']:
19641964
if not os.path.isfile(os.path.expanduser("%(__DAEMON_PUBKEY__)s" %
19651965
user_dict)):
@@ -1983,19 +1983,19 @@ def _generate_confs_prepare(
19831983
pubkey.strip().split()[1].encode('ascii'))
19841984
raw_md5 = make_simple_hash(b64_key)
19851985
# reformat into colon-spearated octets
1986-
daemon_pubkey_md5 = ':'.join(a + b for a, b in zip(raw_md5[::2],
1987-
raw_md5[1::2]))
1986+
cur_pubkey_md5 = ':'.join(a + b for a, b in zip(raw_md5[::2],
1987+
raw_md5[1::2]))
19881988
raw_sha256 = make_safe_hash(b64_key, False)
1989-
daemon_pubkey_sha256 = base64.b64encode(raw_sha256).rstrip('=')
1989+
cur_pubkey_sha256 = base64.b64encode(raw_sha256).rstrip('=')
19901990
except Exception as exc:
19911991
print("ERROR: failed to extract fingerprints of %s : %s" %
19921992
(pubkey_path, exc))
1993-
daemon_pubkey_md5 = ''
1994-
daemon_pubkey_sha256 = ''
1993+
cur_pubkey_md5 = ''
1994+
cur_pubkey_sha256 = ''
19951995
if daemon_pubkey_md5 == keyword_auto:
1996-
user_dict['__DAEMON_PUBKEY_MD5__'] = daemon_pubkey_md5
1996+
user_dict['__DAEMON_PUBKEY_MD5__'] = cur_pubkey_md5
19971997
if daemon_pubkey_sha256 == keyword_auto:
1998-
user_dict['__DAEMON_PUBKEY_SHA256__'] = daemon_pubkey_sha256
1998+
user_dict['__DAEMON_PUBKEY_SHA256__'] = cur_pubkey_sha256
19991999

20002000
# Enable Debian/Ubuntu specific lines only there
20012001
if user_dict['__DISTRO__'].lower() in ('ubuntu', 'debian'):

0 commit comments

Comments
 (0)