From 8cf9661e08718abfc71f5fd85cc5122bbfc16342 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Wed, 24 Nov 2021 18:16:02 +0100 Subject: [PATCH 1/6] root: fix translation, run translation compile on PR Signed-off-by: Jens Langhammer --- .github/workflows/translation-compile.yml | 3 +++ locale/de/LC_MESSAGES/django.mo | Bin 35677 -> 35606 bytes locale/de/LC_MESSAGES/django.po | 4 ---- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/translation-compile.yml b/.github/workflows/translation-compile.yml index 4de6cd529..f630133c6 100644 --- a/.github/workflows/translation-compile.yml +++ b/.github/workflows/translation-compile.yml @@ -4,6 +4,9 @@ on: branches: [ master ] paths: - '/locale/' + pull_request: + paths: + - '/locale/' schedule: - cron: "0 */2 * * *" workflow_dispatch: diff --git a/locale/de/LC_MESSAGES/django.mo b/locale/de/LC_MESSAGES/django.mo index 01a6cacfebde5b9d0078f4b35f624761b077010c..e2c2797fd900637528e7ed2f96fed69a2765b0b1 100644 GIT binary patch delta 8445 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 Date: Wed, 24 Nov 2021 22:41:55 +0100 Subject: [PATCH 2/6] outposts: reload on signal USR1, fix display of reload offset Signed-off-by: Jens Langhammer --- internal/outpost/ak/api.go | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/internal/outpost/ak/api.go b/internal/outpost/ak/api.go index 271f00b00..198d14946 100644 --- a/internal/outpost/ak/api.go +++ b/internal/outpost/ak/api.go @@ -6,6 +6,9 @@ import ( "math/rand" "net/http" "net/url" + "os" + "os/signal" + "syscall" "time" "github.com/go-openapi/strfmt" @@ -87,8 +90,9 @@ func NewAPIController(akURL url.URL, token string) *APIController { instanceUUID: uuid.New(), Outpost: outpost, } - ac.logger.WithField("offset", ac.reloadOffset).Debug("HA Reload offset") + ac.logger.WithField("offset", ac.reloadOffset.String()).Debug("HA Reload offset") ac.initWS(akURL, strfmt.UUID(outpost.Pk)) + ac.configureRefreshSignal() return ac } @@ -107,6 +111,21 @@ func (a *APIController) Start() error { return nil } +func (a *APIController) configureRefreshSignal() { + s := make(chan os.Signal, 1) + go func() { + for { + <-s + err := a.OnRefresh() + if err != nil { + a.logger.WithError(err).Warning("failed to refresh") + } + } + }() + signal.Notify(s, syscall.SIGUSR1) + a.logger.Debug("Enabled USR1 hook to reload") +} + func (a *APIController) OnRefresh() error { // Because we don't know the outpost UUID, we simply do a list and pick the first // The service account this token belongs to should only have access to a single outpost From d2d7acb50e4029afcd092af3c52548ea296e3f2a Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Wed, 24 Nov 2021 22:54:45 +0100 Subject: [PATCH 3/6] website/integrations: update minio callback URL Signed-off-by: Jens Langhammer --- website/integrations/services/minio/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/integrations/services/minio/index.md b/website/integrations/services/minio/index.md index 50bc6d321..bcc58a17c 100644 --- a/website/integrations/services/minio/index.md +++ b/website/integrations/services/minio/index.md @@ -31,7 +31,7 @@ Create an application in authentik. Create an _OAuth2/OpenID Provider_ with the - JWT Algorithm: `RS256` - Scopes: OpenID, Email, Profile and the scope you created above - RSA Key: Select any available key -- Redirect URIs: `https://minio.company/minio/login/openid` +- Redirect URIs: `https://minio.company/oauth_callback` Note the Client ID and Client Secret values. Create an application, using the provider you've created above. Note the slug of the application you've created. From 9c6bf5f4aee90ed46a91365800b7d851880042d0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Nov 2021 08:16:39 +0100 Subject: [PATCH 4/6] build(deps): bump goauthentik.io/api from 0.2021104.2 to 0.2021104.3 (#1842) --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 2c06b1115..9c33fa4ee 100644 --- a/go.mod +++ b/go.mod @@ -29,7 +29,7 @@ require ( github.com/prometheus/client_golang v1.11.0 github.com/recws-org/recws v1.3.1 github.com/sirupsen/logrus v1.8.1 - goauthentik.io/api v0.2021104.2 + goauthentik.io/api v0.2021104.3 golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 // indirect golang.org/x/net v0.0.0-20210510120150-4163338589ed // indirect golang.org/x/oauth2 v0.0.0-20210323180902-22b0adad7558 diff --git a/go.sum b/go.sum index 04dabce51..a15142348 100644 --- a/go.sum +++ b/go.sum @@ -561,8 +561,8 @@ go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -goauthentik.io/api v0.2021104.2 h1:A2SAggdhVj9Xoj+9Ti9DIoOAi+x2WwIlSNNgJCsVZfQ= -goauthentik.io/api v0.2021104.2/go.mod h1:02nnD4FRd8lu8A1+ZuzqownBgvAhdCKzqkKX8v7JMTE= +goauthentik.io/api v0.2021104.3 h1:JG7hKXCdneHXpwWkCAgp6D/fG9NaMUggnUbv18os4Bo= +goauthentik.io/api v0.2021104.3/go.mod h1:02nnD4FRd8lu8A1+ZuzqownBgvAhdCKzqkKX8v7JMTE= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= From f6417f95e58ab6543d5863cf651450c95a3ce435 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Nov 2021 08:17:28 +0100 Subject: [PATCH 5/6] build(deps): bump postcss from 8.3.11 to 8.4.1 in /website (#1841) --- website/package-lock.json | 30 +++++++++++++++--------------- website/package.json | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/website/package-lock.json b/website/package-lock.json index 7400b5c33..5fec32c01 100644 --- a/website/package-lock.json +++ b/website/package-lock.json @@ -12,7 +12,7 @@ "@docusaurus/preset-classic": "2.0.0-beta.9", "@mdx-js/react": "^1.6.22", "clsx": "^1.1.1", - "postcss": "^8.3.11", + "postcss": "^8.4.1", "rapidoc": "^9.1.3", "react": "^17.0.2", "react-before-after-slider-component": "^1.1.1", @@ -8703,13 +8703,13 @@ } }, "node_modules/postcss": { - "version": "8.3.11", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.3.11.tgz", - "integrity": "sha512-hCmlUAIlUiav8Xdqw3Io4LcpA1DOt7h3LSTAC4G6JGHFFaWzI6qvFt9oilvl8BmkbBRX1IhM90ZAmpk68zccQA==", + "version": "8.4.1", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.1.tgz", + "integrity": "sha512-WqLs/TTzXdG+/A4ZOOK9WDZiikrRaiA+eoEb/jz2DT9KUhMNHgP7yKPO8vwi62ZCsb703Gwb7BMZwDzI54Y2Ag==", "dependencies": { "nanoid": "^3.1.30", "picocolors": "^1.0.0", - "source-map-js": "^0.6.2" + "source-map-js": "^1.0.1" }, "engines": { "node": "^10 || ^12 || >=14" @@ -11250,9 +11250,9 @@ } }, "node_modules/source-map-js": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-0.6.2.tgz", - "integrity": "sha512-/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.1.tgz", + "integrity": "sha512-4+TN2b3tqOCd/kaGRJ/sTYA0tR0mdXx26ipdolxcwtJVqEnqNYvlCAt1q3ypy4QMlYus+Zh34RNtYLoq2oQ4IA==", "engines": { "node": ">=0.10.0" } @@ -19364,13 +19364,13 @@ } }, "postcss": { - "version": "8.3.11", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.3.11.tgz", - "integrity": "sha512-hCmlUAIlUiav8Xdqw3Io4LcpA1DOt7h3LSTAC4G6JGHFFaWzI6qvFt9oilvl8BmkbBRX1IhM90ZAmpk68zccQA==", + "version": "8.4.1", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.1.tgz", + "integrity": "sha512-WqLs/TTzXdG+/A4ZOOK9WDZiikrRaiA+eoEb/jz2DT9KUhMNHgP7yKPO8vwi62ZCsb703Gwb7BMZwDzI54Y2Ag==", "requires": { "nanoid": "^3.1.30", "picocolors": "^1.0.0", - "source-map-js": "^0.6.2" + "source-map-js": "^1.0.1" }, "dependencies": { "picocolors": { @@ -21240,9 +21240,9 @@ "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" }, "source-map-js": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-0.6.2.tgz", - "integrity": "sha512-/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug==" + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.1.tgz", + "integrity": "sha512-4+TN2b3tqOCd/kaGRJ/sTYA0tR0mdXx26ipdolxcwtJVqEnqNYvlCAt1q3ypy4QMlYus+Zh34RNtYLoq2oQ4IA==" }, "source-map-support": { "version": "0.5.20", diff --git a/website/package.json b/website/package.json index e4b9cf5bf..b1a4dbf39 100644 --- a/website/package.json +++ b/website/package.json @@ -16,7 +16,7 @@ "@docusaurus/preset-classic": "2.0.0-beta.9", "@mdx-js/react": "^1.6.22", "clsx": "^1.1.1", - "postcss": "^8.3.11", + "postcss": "^8.4.1", "rapidoc": "^9.1.3", "react": "^17.0.2", "react-before-after-slider-component": "^1.1.1", From e13b4a561fc28a88d23009284e245dbb4e39e572 Mon Sep 17 00:00:00 2001 From: Jens L Date: Thu, 25 Nov 2021 11:32:24 +0100 Subject: [PATCH 6/6] web/user: fix filtering for applications based on launchURL --- web/src/user/LibraryPage.ts | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/web/src/user/LibraryPage.ts b/web/src/user/LibraryPage.ts index 8c758b178..70c62e72f 100644 --- a/web/src/user/LibraryPage.ts +++ b/web/src/user/LibraryPage.ts @@ -99,7 +99,15 @@ export class LibraryPage extends LitElement { return html`
${this.apps?.results .filter((app) => { - return app.launchUrl && app.launchUrl.startsWith("http"); + if (app.launchUrl) { + // If the launch URL is a full URL, only show with http or https + if (app.launchUrl.indexOf("://") !== -1) { + return app.launchUrl.startsWith("http"); + } + // If the URL doesn't include a protocol, assume its a relative path + return true; + } + return false; }) .map( (app) =>