diff --git a/.github/actions/delete-preview/Dockerfile b/.github/actions/delete-preview/Dockerfile index 865ed0a33f09fb..fe8f5a6c1ed881 100644 --- a/.github/actions/delete-preview/Dockerfile +++ b/.github/actions/delete-preview/Dockerfile @@ -1,4 +1,4 @@ -FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:pd-test-new-preview-gha.24525 +FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.30393 COPY entrypoint.sh /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] diff --git a/.github/actions/deploy-gitpod/Dockerfile b/.github/actions/deploy-gitpod/Dockerfile index 865ed0a33f09fb..fe8f5a6c1ed881 100644 --- a/.github/actions/deploy-gitpod/Dockerfile +++ b/.github/actions/deploy-gitpod/Dockerfile @@ -1,4 +1,4 @@ -FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:pd-test-new-preview-gha.24525 +FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.30393 COPY entrypoint.sh /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] diff --git a/.github/actions/deploy-monitoring-satellite/Dockerfile b/.github/actions/deploy-monitoring-satellite/Dockerfile index 865ed0a33f09fb..fe8f5a6c1ed881 100644 --- a/.github/actions/deploy-monitoring-satellite/Dockerfile +++ b/.github/actions/deploy-monitoring-satellite/Dockerfile @@ -1,4 +1,4 @@ -FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:pd-test-new-preview-gha.24525 +FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.30393 COPY entrypoint.sh /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] diff --git a/.github/actions/preview-create/Dockerfile b/.github/actions/preview-create/Dockerfile index 865ed0a33f09fb..fe8f5a6c1ed881 100644 --- a/.github/actions/preview-create/Dockerfile +++ b/.github/actions/preview-create/Dockerfile @@ -1,4 +1,4 @@ -FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:pd-test-new-preview-gha.24525 +FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.30393 COPY entrypoint.sh /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 34e7a2b4072fd1..b4429077eaa2c1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -104,7 +104,7 @@ jobs: cancel-in-progress: ${{ needs.configuration.outputs.is_main_branch == 'false' }} runs-on: ${{ needs.create-runner.outputs.label }} container: - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:pd-test-new-preview-gha.24525 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.30393 steps: - uses: actions/checkout@v4 - name: Setup Environment @@ -171,7 +171,7 @@ jobs: ports: - 6379:6379 container: - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:pd-test-new-preview-gha.24525 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.30393 env: DB_HOST: "mysql" DB_PORT: "23306" @@ -425,7 +425,7 @@ jobs: - create-runner runs-on: ${{ needs.create-runner.outputs.label }} container: - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:pd-test-new-preview-gha.24525 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.30393 if: needs.configuration.outputs.with_integration_tests != '' concurrency: group: ${{ needs.configuration.outputs.preview_name }}-integration-test diff --git a/.github/workflows/code-nightly.yml b/.github/workflows/code-nightly.yml index 5a943ce6d1cd92..e970040211ae67 100644 --- a/.github/workflows/code-nightly.yml +++ b/.github/workflows/code-nightly.yml @@ -18,7 +18,7 @@ jobs: runs-on: ${{ needs.create-runner.outputs.label }} needs: [create-runner] container: - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:pd-test-new-preview-gha.24525 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.30393 steps: - uses: actions/checkout@v4 - uses: ./.github/actions/setup-environment diff --git a/.github/workflows/ide-integration-tests.yml b/.github/workflows/ide-integration-tests.yml index ac148fff4d110c..23c25817e8bcf7 100644 --- a/.github/workflows/ide-integration-tests.yml +++ b/.github/workflows/ide-integration-tests.yml @@ -43,7 +43,7 @@ jobs: runs-on: ${{ needs.create-runner.outputs.label }} needs: [create-runner] container: - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:pd-test-new-preview-gha.24525 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.30393 outputs: name: ${{ steps.configuration.outputs.name }} version: ${{ steps.configuration.outputs.version }} @@ -131,7 +131,7 @@ jobs: needs: [configuration, infrastructure, create-runner] runs-on: ${{ needs.create-runner.outputs.label }} container: - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:pd-test-new-preview-gha.24525 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.30393 volumes: - /var/tmp:/var/tmp - /tmp:/tmp diff --git a/.github/workflows/jetbrains-auto-update-template.yml b/.github/workflows/jetbrains-auto-update-template.yml index c5430460b77d0b..13311916785fc4 100644 --- a/.github/workflows/jetbrains-auto-update-template.yml +++ b/.github/workflows/jetbrains-auto-update-template.yml @@ -23,7 +23,7 @@ jobs: update-jetbrains: runs-on: ${{ needs.create-runner.outputs.label }} container: - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:pd-test-new-preview-gha.24525 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.30393 needs: [ create-runner ] steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/jetbrains-integration-test.yml b/.github/workflows/jetbrains-integration-test.yml index 9bb4b905f8d71d..3cc1be061f281c 100644 --- a/.github/workflows/jetbrains-integration-test.yml +++ b/.github/workflows/jetbrains-integration-test.yml @@ -39,7 +39,7 @@ jobs: gcp_credentials: ${{ secrets.SELF_HOSTED_GITHUB_RUNNER_GCP_CREDENTIALS }} jetbrains-smoke-test-linux: container: - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:pd-test-new-preview-gha.24525 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.30393 runs-on: ${{ needs.create-runner.outputs.label }} needs: [create-runner] steps: diff --git a/.github/workflows/preview-env-check-regressions.yml b/.github/workflows/preview-env-check-regressions.yml index 7c7db13a155925..dc52a347077cab 100644 --- a/.github/workflows/preview-env-check-regressions.yml +++ b/.github/workflows/preview-env-check-regressions.yml @@ -99,7 +99,7 @@ jobs: if: ${{ needs.configuration.outputs.skip == 'false' }} runs-on: ${{ needs.create-runner.outputs.label }} container: - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:pd-test-new-preview-gha.24525 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.30393 volumes: - /var/tmp:/var/tmp - /tmp:/tmp diff --git a/.github/workflows/preview-env-gc.yml b/.github/workflows/preview-env-gc.yml index 1642ce2c498e39..87465d51caa77e 100644 --- a/.github/workflows/preview-env-gc.yml +++ b/.github/workflows/preview-env-gc.yml @@ -18,7 +18,7 @@ jobs: runs-on: ${{ needs.create-runner.outputs.label }} needs: [create-runner] container: - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:pd-test-new-preview-gha.24525 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.30393 outputs: names: ${{ steps.set-matrix.outputs.names }} count: ${{ steps.set-matrix.outputs.count }} diff --git a/.github/workflows/workspace-integration-tests.yml b/.github/workflows/workspace-integration-tests.yml index 24a942a54c81ce..00a4a88fae779a 100644 --- a/.github/workflows/workspace-integration-tests.yml +++ b/.github/workflows/workspace-integration-tests.yml @@ -61,7 +61,7 @@ jobs: runs-on: ${{ needs.create-runner.outputs.label }} needs: [create-runner] container: - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:pd-test-new-preview-gha.24525 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.30393 outputs: name: ${{ steps.configuration.outputs.name }} version: ${{ steps.configuration.outputs.version }} @@ -162,7 +162,7 @@ jobs: needs: [configuration, infrastructure, create-runner] runs-on: ${{ needs.create-runner.outputs.label }} container: - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:pd-test-new-preview-gha.24525 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.30393 steps: - uses: actions/checkout@v4 - name: Integration Test diff --git a/.gitpod.yml b/.gitpod.yml index d2b1de4618884b..18164217d4d8c9 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -1,4 +1,4 @@ -image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:pd-test-new-preview-gha.24525 +image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.30393 workspaceLocation: gitpod/gitpod-ws.code-workspace checkoutLocation: gitpod ports: diff --git a/components/ws-proxy/pkg/proxy/cookies.go b/components/ws-proxy/pkg/proxy/cookies.go index b7c1f23688ec6f..99c1b75512d8b4 100644 --- a/components/ws-proxy/pkg/proxy/cookies.go +++ b/components/ws-proxy/pkg/proxy/cookies.go @@ -49,27 +49,37 @@ func readCookies(h http.Header, filter string) []*http.Cookie { if filter != "" && filter != name { continue } - val, ok := parseCookieValue(val, true) + val, quoted, ok := parseCookieValue(val, true) if !ok { continue } - cookies = append(cookies, &http.Cookie{Name: name, Value: val}) + cookies = append(cookies, &http.Cookie{Name: name, Value: val, Quoted: quoted}) } } return cookies } -func parseCookieValue(raw string, allowDoubleQuote bool) (string, bool) { +// parseCookieValue parses a cookie value according to RFC 6265. +// If allowDoubleQuote is true, parseCookieValue will consider that it +// is parsing the cookie-value; +// otherwise, it will consider that it is parsing a cookie-av value +// (cookie attribute-value). +// +// It returns the parsed cookie value, a boolean indicating whether the +// parsing was successful, and a boolean indicating whether the parsed +// value was enclosed in double quotes. +func parseCookieValue(raw string, allowDoubleQuote bool) (value string, quoted, ok bool) { // Strip the quotes, if present. if allowDoubleQuote && len(raw) > 1 && raw[0] == '"' && raw[len(raw)-1] == '"' { raw = raw[1 : len(raw)-1] + quoted = true } for i := 0; i < len(raw); i++ { if !validCookieValueByte(raw[i]) { - return "", false + return "", quoted, false } } - return raw, true + return raw, quoted, true } func validCookieValueByte(b byte) bool {