Merge pull request #13 from distributhor/url-encode-params

Url encode params

Author: distributhor

entrypoint.sh

@@ -1,5 +1,22 @@
 #!/bin/bash
 
+urlencode() {
+    local length="${#1}"
+    for (( i = 0; i < length; i++ )); do
+        local c="${1:i:1}"
+        case $c in
+            [a-zA-Z0-9.~_-]) printf "$c" ;;
+            *) printf '%s' "$c" | xxd -p -c1 |
+                   while read c; do printf '%%%s' "$c"; done ;;
+        esac
+    done
+}
+
+urldecode() {
+    local url_encoded="${1//+/ }"
+    printf '%b' "${url_encoded//%/\\x}"
+}
+
 set -e
 
 if [ -z "$webhook_url" ]; then
@@ -12,32 +29,44 @@ if [ -z "$webhook_secret" ]; then
     exit 1
 fi
 
-WEBHOOK_ENDPOINT=$webhook_url
-
-if [ -n "$webhook_auth" ]; then
-    WEBHOOK_ENDPOINT="-u $webhook_auth $webhook_url"
-fi
-
 if [ -n "$webhook_type" ] && [ "$webhook_type" == "form-urlencoded" ]; then
+    
+    event=`urlencode "$GITHUB_EVENT_NAME"`
+    repository=`urlencode "$GITHUB_REPOSITORY"`
+    commit=`urlencode "$GITHUB_SHA"`
+    ref=`urlencode "$GITHUB_REF"`
+    head=`urlencode "$GITHUB_HEAD_REF"`
+    workflow=`urlencode "$GITHUB_WORKFLOW"`
+
     CONTENT_TYPE="application/x-www-form-urlencoded"
-    FORM_DATA="event=$GITHUB_EVENT_NAME&repository=$GITHUB_REPOSITORY&commit=$GITHUB_SHA&ref=$GITHUB_REF&head=$GITHUB_HEAD_REF&workflow=$GITHUB_WORKFLOW"
+    FORM_DATA="event=$event&repository=$repository&commit=$commit&ref=$ref&head=$head&workflow=$workflow"
+    
     if [ -n "$data" ]; then
         WEBHOOK_DATA="$FORM_DATA&$data"
     else
         WEBHOOK_DATA="$FORM_DATA"
     fi
+
 else
+
     CONTENT_TYPE="application/json"
     JSON_DATA="\"event\":\"$GITHUB_EVENT_NAME\",\"repository\":\"$GITHUB_REPOSITORY\",\"commit\":\"$GITHUB_SHA\",\"ref\":\"$GITHUB_REF\",\"head\":\"$GITHUB_HEAD_REF\",\"workflow\":\"$GITHUB_WORKFLOW\""
+    
     if [ -n "$data" ]; then
         COMPACT_JSON=$(echo -n "$data" | jq -c '')
         WEBHOOK_DATA="{$JSON_DATA,\"data\":$COMPACT_JSON}"
     else
         WEBHOOK_DATA="{$JSON_DATA}"
     fi
+
 fi
 
 WEBHOOK_SIGNATURE=$(echo -n "$WEBHOOK_DATA" | openssl sha1 -hmac "$webhook_secret" -binary | xxd -p)
+WEBHOOK_ENDPOINT=$webhook_url
+
+if [ -n "$webhook_auth" ]; then
+    WEBHOOK_ENDPOINT="-u $webhook_auth $webhook_url"
+fi
 
 echo "Content Type: $CONTENT_TYPE"
 
@@ -48,7 +77,6 @@ curl -k -v \
     -H "X-GitHub-Delivery: $GITHUB_RUN_NUMBER" \
     -H "X-GitHub-Event: $GITHUB_EVENT_NAME" \
     --data "$WEBHOOK_DATA" $WEBHOOK_ENDPOINT
-    # -D - $WEBHOOK_ENDPOINT --data-urlencode @"$GITHUB_EVENT_PATH"
 
 # wget -q --server-response --timeout=2000 -O - \
 #    --header="Content-Type: application/json" \