Fix "Login Failed: Unable to find a valid CSRF token. Please try again." #1717

michaljurecko · 2024-04-22T20:41:39Z

Jira: https://keboola.atlassian.net/browse/PSGO-553

Changes:

FIxed bug, see Jira.
- Added redirect to canonical host, to match cookies domain
Fixed minor issues, typos, ...

github-actions · 2024-04-22T20:56:50Z

Apps Proxy Kubernetes Diff [CI]

Between base 9c1d694 ⬅️ head 0d74d66.

Expand

--- /tmp/artifacts/test-k8s-state.old.json.processed.kv	2024-04-22 20:56:48.384645664 +0000
+++ /tmp/artifacts/test-k8s-state.new.json.processed.kv	2024-04-22 20:56:48.504646690 +0000
@@ -105 +105 @@
-<Deployment/apps-proxy>.spec.template.spec.containers[0].image = "docker.io/keboola/apps-proxy:9c1d694";
+<Deployment/apps-proxy>.spec.template.spec.containers[0].image = "docker.io/keboola/apps-proxy:0d74d66";
@@ -461,3 +461,3 @@
-<Pod/apps-proxy-<hash>>.spec.containers[0].image = "docker.io/keboola/apps-proxy:9c1d694";
-<Pod/apps-proxy-<hash>>.spec.containers[0].image = "docker.io/keboola/apps-proxy:9c1d694";
-<Pod/apps-proxy-<hash>>.spec.containers[0].image = "docker.io/keboola/apps-proxy:9c1d694";
+<Pod/apps-proxy-<hash>>.spec.containers[0].image = "docker.io/keboola/apps-proxy:0d74d66";
+<Pod/apps-proxy-<hash>>.spec.containers[0].image = "docker.io/keboola/apps-proxy:0d74d66";
+<Pod/apps-proxy-<hash>>.spec.containers[0].image = "docker.io/keboola/apps-proxy:0d74d66";
@@ -879 +879 @@
-<ReplicaSet/apps-proxy-<hash>>.spec.template.spec.containers[0].image = "docker.io/keboola/apps-proxy:9c1d694";
+<ReplicaSet/apps-proxy-<hash>>.spec.template.spec.containers[0].image = "docker.io/keboola/apps-proxy:0d74d66";


(see artifacts in the Github Action for more information)

michaljurecko · 2024-04-23T05:11:35Z

internal/pkg/service/appsproxy/config/static.go

@@ -0,0 +1,3 @@
+package config
+
+const InternalPrefix = "/_proxy"


Now it is only one place where /_proxy prefix is defined.

michaljurecko · 2024-04-23T05:11:53Z

internal/pkg/service/appsproxy/dataapps/api/config.go

+// CookieDomain without port for cookies.
+func (c AppConfig) CookieDomain(publicURL *url.URL) string {
+	return c.Domain() + "." + publicURL.Hostname()
+}
+
+// BaseURL of the app.
+func (c AppConfig) BaseURL(publicURL *url.URL) *url.URL {
+	return &url.URL{
+		Scheme: publicURL.Scheme,
+		Host:   c.Domain() + "." + publicURL.Host,
+		Path:   "/",
+	}
+}
+


New helper methods.

michaljurecko · 2024-04-23T05:12:21Z

internal/pkg/service/appsproxy/proxy/apphandler/apphandler.go

@@ -21,6 +23,7 @@ import (
 type appHandler struct {
 	manager            *Manager
 	app                api.AppConfig
+	baseURL            *url.URL


Added baseURL field, so it is cached.

michaljurecko · 2024-04-23T05:15:17Z

internal/pkg/service/appsproxy/proxy/apphandler/apphandler.go

+	// Redirect request to canonical host to match cookies domain
+	if req.Host != h.baseURL.Host {
+		w.Header().Set("Location", h.baseURL.ResolveReference(&url.URL{Path: req.URL.Path}).String())
+		w.WriteHeader(http.StatusPermanentRedirect)
+		return nil
+	}
+


michaljurecko · 2024-04-23T05:15:31Z

internal/pkg/service/appsproxy/proxy/proxy_test.go

+		{
+			name: "redirect-to-canonical-host",
+			run: func(t *testing.T, client *http.Client, m []*mockoidc.MockOIDC, appServer *testutil.AppServer, service *testutil.DataAppsAPI, dnsServer *dnsmock.Server) {
+				// Redirect to the canonical URL (match cookies domain)
+				request, err := http.NewRequestWithContext(context.Background(), http.MethodGet, "https://foo-bar-123.hub.keboola.local/some/data/app/url?foo=bar", nil)
+				require.NoError(t, err)
+				response, err := client.Do(request)
+				require.NoError(t, err)
+				require.Equal(t, http.StatusPermanentRedirect, response.StatusCode)
+				location := response.Header.Get("Location")
+				assert.Equal(t, location, "https://public-123.hub.keboola.local/some/data/app/url")
+			},
+			expectedNotifications: map[string]int{},
+			expectedWakeUps:       map[string]int{},
+		},


michaljurecko · 2024-04-23T05:16:52Z

internal/pkg/service/appsproxy/proxy/server.go

-	loggerWriter := logging.NewLoggerWriter(d.Logger(), "info")
+	loggerWriter := logging.NewLoggerWriter(d.Logger().WithComponent("oauth2proxy"), "info")
 	oautproxylogger.SetOutput(loggerWriter)


Mark logs from the OAuth2Proxy lib.

michaljurecko · 2024-04-23T05:18:04Z

internal/pkg/service/appsproxy/proxy/server_test.go

-	// Get style.css
-	rec = httptest.NewRecorder()
-	req = httptest.NewRequest("GET", "https://hub.keboola.local/_proxy/assets/style.css", nil)
-	handler.ServeHTTP(rec, req)
-	require.Equal(t, http.StatusOK, rec.Code)
-	assert.NotEmpty(t, rec.Body.String())
-


Petr, you could have deleted it yourself when you added new assets.

I didn't remove that, because I wanted to have some test for an asset that exists. Yes, I could use favicon.ico instead style.css

michaljurecko · 2024-04-23T05:18:54Z

internal/pkg/service/appsproxy/proxy/server_test.go

@@ -193,38 +193,6 @@ func TestAppProxyHandler(t *testing.T) {
            }
          ],
        },
-        {


Removed style.css request.

michaljurecko · 2024-04-23T05:19:08Z

internal/pkg/service/appsproxy/dataapps/appconfig/appconfig.go

+	ctx, span := l.telemetry.Tracer().Start(ctx, "keboola.go.apps-proxy.appconfig.Loader.GetConfig")
+	defer span.End(&err)
+


michaljurecko · 2024-04-23T05:19:44Z

provisioning/apps-proxy/dev/.air.toml

-  args_bin = []
+  args_bin = ["--sandboxes-api-url",  "http://localhost:1234", "--sandboxes-api-token", "my-token", "--api-public-url", "http://localhost:8000"]
  cmd = "make build-apps-proxy"


Minimal config to run the proxy locally (without any sandboxes api).

michaljurecko · 2024-04-23T05:21:46Z

internal/pkg/service/appsproxy/proxy/pagewriter/template/error.gohtml

-       <h1>
-           {{.App.IDAndName}}
-       </h1>
+      <h1>Application {{.App.IDAndName}}</h1>
+      {{ if .App.ProjectID }} <h2>Project {{.App.ProjectID}}</h2>{{ end }}
    {{ end }}
 </header>
 <main>


Small improvements in templates, so it is temporary better, until the design will be fixed:

michaljurecko added 15 commits April 22, 2024 21:49

style: add constant config.InternalPrefix

5f6818f

feat: Add CookieDomain, BaseURL methods

cd2f0f2

feat: appHandler, add baseURL field

21bc806

fix: Add redirect to canonical host, to match cookies domain

e313fea

feat: Mark logs from oauth2proxy

f811fb6

fix: Typo

0d340b3

fix: Removed unused style.css

be8dc20

fix: Fix assets paths

f335c14

fix: Small improvements in templates

a4a1113

fix: spinner page data

b818e5c

style: Simplify code

23def51

tests: Update tests

d93da82

tests: Update metrics snapshot

4c13969

feat: Add span

0a3f8f2

fix: make run-apps-proxy

0d74d66

michaljurecko force-pushed the michaljurecko-PSGO-553 branch from 1c679b2 to 0d74d66 Compare April 22, 2024 20:50

michaljurecko commented Apr 23, 2024

View reviewed changes

michaljurecko marked this pull request as ready for review April 23, 2024 05:19

michaljurecko requested review from jachym-tousek-keboola and hosekpeter April 23, 2024 05:20

michaljurecko commented Apr 23, 2024

View reviewed changes

hosekpeter approved these changes Apr 23, 2024

View reviewed changes

jachym-tousek-keboola approved these changes Apr 23, 2024

View reviewed changes

michaljurecko merged commit d5adfca into main Apr 23, 2024
14 checks passed

michaljurecko deleted the michaljurecko-PSGO-553 branch April 23, 2024 08:12

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix "Login Failed: Unable to find a valid CSRF token. Please try again." #1717

Fix "Login Failed: Unable to find a valid CSRF token. Please try again." #1717

michaljurecko commented Apr 22, 2024

github-actions bot commented Apr 22, 2024

michaljurecko Apr 23, 2024

michaljurecko Apr 23, 2024

michaljurecko Apr 23, 2024

michaljurecko Apr 23, 2024

michaljurecko Apr 23, 2024

michaljurecko Apr 23, 2024

michaljurecko Apr 23, 2024

hosekpeter Apr 23, 2024

michaljurecko Apr 23, 2024

michaljurecko Apr 23, 2024

michaljurecko Apr 23, 2024

michaljurecko Apr 23, 2024

		@@ -0,0 +1,3 @@
		package config

		const InternalPrefix = "/_proxy"

@@ @@ -193,38 +193,6 @@ func TestAppProxyHandler(t *testing.T) { @@
                           }
                         ],
                       },
-                      {

		ctx, span := l.telemetry.Tracer().Start(ctx, "keboola.go.apps-proxy.appconfig.Loader.GetConfig")
		defer span.End(&err)

Fix "Login Failed: Unable to find a valid CSRF token. Please try again." #1717

Fix "Login Failed: Unable to find a valid CSRF token. Please try again." #1717

Conversation

michaljurecko commented Apr 22, 2024

github-actions bot commented Apr 22, 2024

Apps Proxy Kubernetes Diff [CI]

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment