Merge commit 'a7a6d7ad2cba7831544b160d9038cde2773dff4e'

[shellwiki] / handlers / 20_attachment.sh

diff --git a/handlers/20_attachment.sh b/handlers/20_attachment.sh
index 983cc7ee043e38bc87db4898d63be355a7e036e2..a1168978d769f5d57ce90829a5e1abed756c10fc 100755 (executable)
--- a/handlers/20_attachment.sh
+++ b/handlers/20_attachment.sh
@@ -2,6 +2,8 @@
 
 . "$_EXEC/cgilite/file.sh"
 
+REV_ATTACHMENTS="${REV_ATTACHMENTS:-false}"
+
 attachment_convert(){
   local attpath="$1"
   local cachepath="${attpath%/#attachments/*}/#cache/${attpath#*/#attachments/}"
@@ -61,18 +63,41 @@ attachment_convert(){
       printf %s "$attpath"
       return 0
     ;;
+    *) printf "$attpath";;
   esac
 }
 
 case ${PATH_INFO} in
   */\[attachment\]/)
+    # no trailing slash
+    REDIRECT "${_BASE}${PATH_INFO%/}"
+    ;;
+  */*/)
+    # attached files never end on /
+    return 1
+    ;;
+  */\[attachment\])
+    # show attachment page
+    # receive uploads
     tsid="$(POST session_key)"; tsid="${tsid%% *}"
+    action="$(POST action)"
     attachment_delete="$(POST delete)"
+    page="${PATH_INFO%\[attachment\]}"
 
-    if [ "${CONTENT_TYPE%%;*}" = "multipart/form-data" ] && acl_write "${PATH_INFO%\[attachment\]/}"; then
+    if [ ! -d "$_DATA/pages${page}" -a ! -d "$_DATA/pages${page}" ]; then
+      # base page does not exist
+      return 1
+    elif [ "${CONTENT_TYPE%%;*}" = "multipart/form-data" ] && acl_write "${page}"; then
       . "$_EXEC/multipart.sh"
       multipart_cache
 
+      # Use positional parameters for filename collection
+      # The positional array is the only array available
+      # in plain posix shells, see the documentation for
+      # your shells "set" builtin for a hint to this
+      # obscure use mode
+      set --
+
       # Validate session id from form to prevent CSRF
       # Only validate if username is present, because no username means
       # anonymous uploads are allowed via acl and cgilite/session.sh does not
@@ -84,31 +109,63 @@ case ${PATH_INFO} in
         return 0
       fi
 
-      mkdir -p "$_DATA/pages/${PATH_INFO%/\[attachment\]/}/#attachments/"
+      mkdir -p "$_DATA/pages${page}#attachments/"
       n=1; while filename=$(multipart_filename "file" "$n"); do
         filename="$(printf %s "$filename" |tr /\\0 __)"
-        multipart "file" "$n" >"$_DATA/pages/${PATH_INFO%/\[attachment\]/}/#attachments/$filename"
+        set -- "$@" "pages${page}#attachments/$filename"
+        multipart "file" "$n" >"$_DATA/pages${page}#attachments/$filename"
         n=$((n + 1))
       done
       rm -- "$multipart_cachefile"
+      if [ "$REV_ATTACHMENTS" = true ]; then
+        git -C "$_DATA" add -- "$@"
+        git -C "$_DATA" commit -qm "Attachments to # $page # uploaded by @ $USER_NAME @" -- "$@"
+      fi
       REDIRECT "${_BASE}${PATH_INFO}"
     elif [ "${CONTENT_TYPE%%;*}" = "multipart/form-data" ]; then
       printf 'Refresh: %i\r\n' 4
       theme_error 403
       head -c $((CONTENT_LENGTH)) >/dev/null
       return 0
-    elif [ "$attachment_delete" -a "$SESSION_ID" = "$tsid" ]; then
-      rm -- "$_DATA/pages/${PATH_INFO%/\[attachment\]/}/#attachments/$attachment_delete"
+    elif [ "$action" = delete -a "$SESSION_ID" = "$tsid" ] && acl_write "${page}"; then
+      set --
+      n="$(POST_COUNT select)"; while [ $n -gt 0 ]; do
+        delete="$(POST select $n |PATH)"
+        set -- "$@" "pages${page}#attachments/${delete##*/}"
+        n=$((n - 1))
+      done
+      if [ "$REV_ATTACHMENTS" = true ]; then
+        git -C "$_DATA" rm -- "$@"
+        git -C "$_DATA" commit -qm \
+            "Attachment to # $page # deleted by @ $USER_NAME @" -- "$@"
+      else
+        rm -- "$@"
+      fi
       REDIRECT "${_BASE}${PATH_INFO}"
-    elif [ "$attachment_delete" ]; then
+    elif [ "$action" = delete ]; then
       printf 'Refresh: %i\r\n' 4
       theme_error 403
       return 0
-    elif acl_read "${PATH_INFO%\[attachment\]/}"; then
-      theme_attachments "${PATH_INFO%\[attachment\]/}"
+    # elif [ "$attachment_delete" -a "$SESSION_ID" = "$tsid" ]; then
+    #   if [ "$REV_ATTACHMENTS" = true ]; then
+    #     git -C "$_DATA" rm -- \
+    #         "$_DATA/pages${page}#attachments/$attachment_delete"
+    #     git -C "$_DATA" commit -qm \
+    #         "Attachment to # $page # deleted by @ $USER_NAME @" -- \
+    #         "$_DATA/pages${page}#attachments/$attachment_delete"
+    #   else
+    #     rm -- "$_DATA/pages${page}#attachments/$attachment_delete"
+    #   fi
+    #   REDIRECT "${_BASE}${PATH_INFO}"
+    # elif [ "$attachment_delete" ]; then
+    #   printf 'Refresh: %i\r\n' 4
+    #   theme_error 403
+    #   return 0
+    elif ! acl_read "${page}"; then
+      theme_error 403
       return 0
     else
-      theme_error 404
+      theme_attachments "${page}"
       return 0
     fi
     ;;
@@ -116,7 +173,9 @@ case ${PATH_INFO} in
   */\[attachment\]/*)
     attpath="${PATH_INFO%/\[attachment\]/*}/#attachments/${PATH_INFO##*/}"
 
-    if ! acl_read "${PATH_INFO%/\[attachment\]/*}"; then
+    if [ ! -f "$_DATA/pages/$attpath" -a ! -f "$_EXEC/pages/$attpath" ]; then
+      return 1
+    elif ! acl_read "${PATH_INFO%/\[attachment\]/*}"; then
       theme_error 403
       return 0
     elif [ -f "$_DATA/pages/$attpath" ]; then
@@ -125,18 +184,14 @@ case ${PATH_INFO} in
     elif [ -f "$_EXEC/pages/$attpath" ]; then
       FILE "$_EXEC/pages/$attpath"
       return 0
-    else
-      theme_error 404
-      return 0
     fi
     ;;
-  */*/)
-    return 1
-    ;;
   */*)
     attpath="${PATH_INFO%/*}/#attachments/${PATH_INFO##*/}"
 
-    if ! acl_read "${PATH_INFO%/*}/"; then
+    if [ ! -f "$_DATA/pages/$attpath" -a ! -f "$_EXEC/pages/$attpath" ]; then
+      return 1
+    elif ! acl_read "${PATH_INFO%/*}/"; then
       theme_error 403
       return 0
     elif [ -f "$_DATA/pages/$attpath" ]; then
@@ -145,11 +200,6 @@ case ${PATH_INFO} in
     elif [ -f "$_EXEC/pages/$attpath" ]; then
       FILE "$(attachment_convert "$_EXEC/pages/$attpath")"
       return 0
-    elif [ -d "$_DATA/pages/${PATH_INFO}" -o -d "$_EXEC/pages/${PATH_INFO}" ]; then
-      REDIRECT "${_BASE}${PATH_INFO}/"
-    elif [ "${PATH_INFO%\[*\]}" = "${PATH_INFO}" ]; then
-      theme_error 404
-      return 0
     fi
     ;;
 esac