Merge remote-tracking branch 'lass/master'

2 files changed, 32 insertions, 9 deletions

diff --git a/krebs/5pkgs/simple/generate-secrets/default.nix b/krebs/5pkgs/simple/generate-secrets/default.nix
index a800ff543..f9a7450f7 100644
--- a/krebs/5pkgs/simple/generate-secrets/default.nix
+++ b/krebs/5pkgs/simple/generate-secrets/default.nix
@@ -1,20 +1,21 @@
 { pkgs }:
-pkgs.writeDashBin "generate-secrets" ''
+pkgs.writers.writeDashBin "generate-secrets" ''
+  set -eu
   HOSTNAME="$1"
   TMPDIR=$(${pkgs.coreutils}/bin/mktemp -d)
+  cd $TMPDIR
+
   PASSWORD=$(${pkgs.pwgen}/bin/pwgen 25 1)
   HASHED_PASSWORD=$(echo $PASSWORD | ${pkgs.hashPassword}/bin/hashPassword -s) > /dev/null
 
   ${pkgs.openssh}/bin/ssh-keygen -t ed25519 -f $TMPDIR/ssh.id_ed25519 -P "" -C "" >/dev/null
-  ${pkgs.openssl}/bin/openssl genrsa -out $TMPDIR/retiolum.rsa_key.priv 4096 2>/dev/null > /dev/null
-  ${pkgs.openssl}/bin/openssl rsa -in $TMPDIR/retiolum.rsa_key.priv -pubout -out $TMPDIR/retiolum.rsa_key.pub 2>/dev/null > /dev/null
+  ${pkgs.tinc_pre}/bin/tinc --config "$TMPDIR" generate-keys 4096 >/dev/null
   cat <<EOF > $TMPDIR/hashedPasswords.nix
   {
     root = "$HASHED_PASSWORD";
   }
   EOF
 
-  cd $TMPDIR
   for x in *; do
     ${pkgs.coreutils}/bin/cat $x | ${pkgs.brain}/bin/brain insert -m krebs-secrets/$HOSTNAME/$x > /dev/null
   done
@@ -31,9 +32,12 @@ pkgs.writeDashBin "generate-secrets" ''
           aliases = [
             "$HOSTNAME.r"
           ];
-          tinc.pubkey = ${"''"}
-  $(cat $TMPDIR/retiolum.rsa_key.pub)
-          ${"''"};
+          tinc = {
+            pubkey = ${"''"}
+  $(cat $TMPDIR/rsa_key.pub)
+            ${"''"};
+            pubkey_ed25519 = "$(cut -d ' ' -f 3 $TMPDIR/ed25519_key.pub)";
+          };
         };
       };
       ssh.privkey.path = <secrets/ssh.id_ed25519>;
diff --git a/krebs/5pkgs/simple/htgen-cyberlocker/src/htgen-cyberlocker b/krebs/5pkgs/simple/htgen-cyberlocker/src/htgen-cyberlocker
index 5ca0ddd3e..d04b4b1f0 100644
--- a/krebs/5pkgs/simple/htgen-cyberlocker/src/htgen-cyberlocker
+++ b/krebs/5pkgs/simple/htgen-cyberlocker/src/htgen-cyberlocker
@@ -5,6 +5,13 @@ emptyok_response() {(
   printf '\r\n'
 )}
 
+not_modifed_response() {(
+  printf "HTTP/1.1 304 Not Modified\r\n"
+  printf 'Connection: close\r\n'
+  printf 'Server: %s\r\n' "$Server"
+  printf '\r\n'
+)}
+
 delete_response() {
   jq -n -r \
   --arg server "$Server" \
@@ -74,8 +81,20 @@ case "$Method $path" in
   'GET /'*)
     item=$STATEDIR/items/$(echo "$path" | jq -rR @uri)
     if [ -e "$item" ]; then
-      file_response "$item"
-      exit
+      if [ -z ${req_if_modified_since+x} ]; then
+        file_response "$item"
+        exit
+      else
+        age_file=$(date +%s -r "$item")
+        age_header=$(date +%s --date="$req_if_modified_since")
+        if [ "$age_file" -lt "$age_header" ]; then
+          not_modifed_response
+          exit
+        else
+          file_response "$item"
+          exit
+        fi
+      fi
     fi
   ;;
   'DELETE /'*)