Squashed 'clickslide/' changes from b771768..08ca3fa

[vhs_kurs] / cgilite / session.sh

diff --git a/cgilite/session.sh b/cgilite/session.sh
index 25a65987c3671df4f4c8499279a71487edad5775..8ed8d8808e0655cc8b89c6ce7bb0df318b0b571f 100755 (executable)
--- a/cgilite/session.sh
+++ b/cgilite/session.sh
@@ -41,6 +41,15 @@ timeid(){
 
 checkid(){ grep -m 1 -xE '[0-9a-zA-Z:=]{16}'; }
 
+transid(){
+  # transaction ID to modify a given file
+  local file="$1"
+  { stat -c %F%i%n%N%s%Y "$file" 2>&-
+    printf %s "$SESSION_ID"
+    server_key
+  } | sha256sum | cut -d\  -f1
+}
+
 update_session(){
   local session sid time sig serverkey checksig
 
@@ -53,9 +62,9 @@ update_session(){
   checksig="${checksig%% *}"
   d=$(date +%s)
   
-  if [ "$checksig" != "$sig" \
-    -o "$time" -lt "$d" \
-    -o ! "$(printf %s "$sid" |checkid)" ] 2>&-
+  if ! [ "$checksig" = "$sig" \
+    -a "$time" -ge "$d" \
+    -a "$(printf %s "$sid" |checkid)" ] 2>&-
   then
     debug Setting up new session
     sid="$(randomid)"