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

Author: jonasbardino

mig/shared/install.py

@@ -1958,13 +1958,13 @@ def _generate_confs_prepare(
             raw_sha256 = force_native_str(openssl_proc.stdout.read()).strip()
             # NOTE: openssl outputs something like 'SHA256 Fingerprint=BLA'
             #       but algo part case may vary - split and take last part.
-            daemon_keycert_sha256 = raw_sha256.split(" Fingerprint=", 1)[-1]
+            cur_keycert_sha256 = raw_sha256.split(" Fingerprint=", 1)[-1]
         except Exception as exc:
             print("ERROR: failed to extract sha256 fingerprint of %s: %s" %
                   (key_path, exc))
-            daemon_keycert_sha256 = ''
+            cur_keycert_sha256 = ''
         if daemon_keycert_sha256 == keyword_auto:
-            user_dict['__DAEMON_KEYCERT_SHA256__'] = daemon_keycert_sha256
+            user_dict['__DAEMON_KEYCERT_SHA256__'] = cur_keycert_sha256
     if user_dict['__DAEMON_PUBKEY__']:
         if not os.path.isfile(os.path.expanduser("%(__DAEMON_PUBKEY__)s" %
                                                  user_dict)):
@@ -1988,21 +1988,21 @@ def _generate_confs_prepare(
             b64_key = base64.b64decode(pubkey.strip().split()[1])
             raw_md5 = make_simple_hash(b64_key)
             # reformat into colon-spearated octets
-            daemon_pubkey_md5 = ':'.join(a + b for a, b in zip(raw_md5[::2],
-                                                               raw_md5[1::2]))
+            cur_pubkey_md5 = ':'.join(a + b for a, b in zip(raw_md5[::2],
+                                                            raw_md5[1::2]))
             raw_sha256 = make_safe_hash(b64_key, False)
             # NOTE: b64encode takes bytes and returns bytes
-            daemon_pubkey_sha256 = force_native_str(
+            cur_pubkey_sha256 = force_native_str(
                 base64.b64encode(raw_sha256)).rstrip('=')
         except Exception as exc:
             print("ERROR: failed to extract fingerprints of %s : %s" %
                   (pubkey_path, exc))
-            daemon_pubkey_md5 = ''
-            daemon_pubkey_sha256 = ''
+            cur_pubkey_md5 = ''
+            cur_pubkey_sha256 = ''
         if daemon_pubkey_md5 == keyword_auto:
-            user_dict['__DAEMON_PUBKEY_MD5__'] = daemon_pubkey_md5
+            user_dict['__DAEMON_PUBKEY_MD5__'] = cur_pubkey_md5
         if daemon_pubkey_sha256 == keyword_auto:
-            user_dict['__DAEMON_PUBKEY_SHA256__'] = daemon_pubkey_sha256
+            user_dict['__DAEMON_PUBKEY_SHA256__'] = cur_pubkey_sha256
 
     # Enable Debian/Ubuntu specific lines only there
     if user_dict['__DISTRO__'].lower() in ('ubuntu', 'debian'):