diff --git a/.circleci/ciignore.sh b/.circleci/ciignore.sh index 61b313d0c0bb9..c99de4ce1160d 100755 --- a/.circleci/ciignore.sh +++ b/.circleci/ciignore.sh @@ -28,9 +28,14 @@ if [[ ! -a "$ROOT/.ciignore" ]]; then fi # Check CIRCLE_COMPARE_URL first and if its not set, check for diff with master. + if [[ ! -z "$CIRCLE_COMPARE_URL" ]]; then # CIRCLE_COMPARE_URL is not empty, use it to get the diff - COMMIT_RANGE=$(echo $CIRCLE_COMPARE_URL | sed 's:^.*/compare/::g') + if [[ $CIRCLE_COMPARE_URL = *"commit"* ]]; then + COMMIT_RANGE=$(echo $CIRCLE_COMPARE_URL | sed 's:^.*/commit/::g')~1 + else + COMMIT_RANGE=$(echo $CIRCLE_COMPARE_URL | sed 's:^.*/compare/::g') + fi echo "Diff: $COMMIT_RANGE" changes="$(git diff $COMMIT_RANGE --name-only)" else diff --git a/server/src-lib/Hasura/Server/Auth.hs b/server/src-lib/Hasura/Server/Auth.hs index 2474d37decca8..d12e64445b84e 100644 --- a/server/src-lib/Hasura/Server/Auth.hs +++ b/server/src-lib/Hasura/Server/Auth.hs @@ -112,7 +112,11 @@ userInfoFromWebhook logger manager urlT reqHeaders = do throw500 "Internal Server Error" filteredHeaders = flip filter reqHeaders $ \(n, _) -> - n `notElem` ["Content-Length", "User-Agent", "Host", "Origin", "Referer"] + n `notElem` [ "Content-Length", "Content-MD5", "User-Agent", "Host" + , "Origin", "Referer" , "Accept", "Accept-Encoding" + , "Accept-Language", "Accept-Datetime" + , "Cache-Control", "Connection", "DNT" + ] accessKeyHeader :: T.Text accessKeyHeader = "x-hasura-access-key"