X-Git-Url: http://git.plutz.net/?p=cgilite;a=blobdiff_plain;f=session.sh;h=8ed8d8808e0655cc8b89c6ce7bb0df318b0b571f;hp=60ae57734a6b1e659460139c7b1b497fae5d866b;hb=c232fc5fab2ae7a4ea68737a03c7c4057ef872d6;hpb=3fe2a9ceb477adf245f6cc8f72fb61282e42c904

diff --git a/session.sh b/session.sh
index 60ae577..8ed8d88 100755
--- a/session.sh
+++ b/session.sh
@@ -39,7 +39,16 @@ timeid(){
   } | slopecode
 }
 
-checkid(){ grep -m 1 -xE '[0-9a-zA-Z:_]{16}'; }
+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)"