Changeset 118 in bookmarks

Timestamp:

02/18/16 23:31:14 (9 years ago)

Author:

peter

Message:

Moved the digest_key generation into the BookmarksApp, so that it only happens on app startup.

Location:

trunk

Files:

• bin/bkmkd (modified) (1 diff)
• lib/BookmarksApp.pm (modified) (1 diff)

trunk/bin/bkmkd

@@ -47 +47 @@
         %DEFINES,
     };
-
-    # if authentication is enabled and no digest_key is provided, generate one
-    # don't do this if it isn't needed, since this is sometimes not a fast operation
-    if ($config->{auth} && !$config->{digest_key}) {
-        warn "Generating digest authentication secret...\n";
-        require Bytes::Random::Secure;
-        $config->{digest_key} = Bytes::Random::Secure::random_bytes_base64(16, '');
-    }
 
     # make config paths absolute before handing off to the app

trunk/lib/BookmarksApp.pm

@@ -122 +122 @@
         $config->{realm} ||= 'Bookmarks';
         $config->{htdigest} or die "No htdigest configured for authentication\n";
+
+        # if authentication is enabled and no digest_key is provided, generate one
+        # don't do this if it isn't needed, since this is sometimes not a fast operation
+        if (!$config->{digest_key}) {
+            warn "Generating digest authentication secret...\n";
+            require Bytes::Random::Secure;
+            $config->{digest_key} = Bytes::Random::Secure::random_bytes_base64(16, '');
+        }
+
         open my $htdigest, '<', $config->{htdigest} or die "Can't open $$config{htdigest}\n";
         while (my $credentials = <$htdigest>) {