1.15.1 do not add trailing slash OIDC provider

pass provider as-is. Authentik users should add a trailing slash
update dark / light stack screenshot to have action buttons
2026-03-18 14:40:42 -05:00 · 2024-10-07 13:23:40 -04:00 · 2024-10-07 13:16:25 -04:00 · 2024-10-07 08:05:39 -04:00 · 2024-10-07 07:30:18 -04:00 · 2024-10-07 07:30:11 -04:00
39 changed files with 100 additions and 93 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -41,7 +41,7 @@ dependencies = [

 [[package]]
 name = "alerter"
-version = "1.15.0"
+version = "1.15.1"
 dependencies = [
 "anyhow",
 "axum",
@@ -943,7 +943,7 @@ dependencies = [

 [[package]]
 name = "command"
-version = "1.15.0"
+version = "1.15.1"
 dependencies = [
 "komodo_client",
 "run_command",
@@ -1355,7 +1355,7 @@ dependencies = [

 [[package]]
 name = "environment_file"
-version = "1.15.0"
+version = "1.15.1"
 dependencies = [
 "thiserror",
 ]
@@ -1439,7 +1439,7 @@ dependencies = [

 [[package]]
 name = "formatting"
-version = "1.15.0"
+version = "1.15.1"
 dependencies = [
 "serror",
 ]
@@ -1571,7 +1571,7 @@ checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"

 [[package]]
 name = "git"
-version = "1.15.0"
+version = "1.15.1"
 dependencies = [
 "anyhow",
 "command",
@@ -2192,7 +2192,7 @@ dependencies = [

 [[package]]
 name = "komodo_cli"
-version = "1.15.0"
+version = "1.15.1"
 dependencies = [
 "anyhow",
 "clap",
@@ -2208,7 +2208,7 @@ dependencies = [

 [[package]]
 name = "komodo_client"
-version = "1.15.0"
+version = "1.15.1"
 dependencies = [
 "anyhow",
 "async_timing_util",
@@ -2239,7 +2239,7 @@ dependencies = [

 [[package]]
 name = "komodo_core"
-version = "1.15.0"
+version = "1.15.1"
 dependencies = [
 "anyhow",
 "async_timing_util",
@@ -2296,7 +2296,7 @@ dependencies = [

 [[package]]
 name = "komodo_periphery"
-version = "1.15.0"
+version = "1.15.1"
 dependencies = [
 "anyhow",
 "async_timing_util",
@@ -2382,7 +2382,7 @@ dependencies = [

 [[package]]
 name = "logger"
-version = "1.15.0"
+version = "1.15.1"
 dependencies = [
 "anyhow",
 "komodo_client",
@@ -2446,7 +2446,7 @@ dependencies = [

 [[package]]
 name = "migrator"
-version = "1.15.0"
+version = "1.15.1"
 dependencies = [
 "anyhow",
 "dotenvy",
@@ -3101,7 +3101,7 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"

 [[package]]
 name = "periphery_client"
-version = "1.15.0"
+version = "1.15.1"
 dependencies = [
 "anyhow",
 "komodo_client",
@@ -4879,7 +4879,7 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"

 [[package]]
 name = "update_logger"
-version = "1.15.0"
+version = "1.15.1"
 dependencies = [
 "anyhow",
 "komodo_client",
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,7 +3,7 @@ resolver = "2"
 members = ["bin/*", "lib/*", "client/core/rs", "client/periphery/rs"]

 [workspace.package]
-version = "1.15.0"
+version = "1.15.1"
 edition = "2021"
 authors = ["mbecker20 <becker.maxh@gmail.com>"]
 license = "GPL-3.0-or-later"
--- a/bin/core/src/auth/oidc/client.rs
+++ b/bin/core/src/auth/oidc/client.rs
@@ -32,17 +32,15 @@ pub async fn init_default_oidc_client() {
    return;
  }
  async {
-    let provider = config.oidc_provider.to_string();
    // Use OpenID Connect Discovery to fetch the provider metadata.
    let provider_metadata = CoreProviderMetadata::discover_async(
-      IssuerUrl::new(if provider.ends_with('/') {
-        provider
-      } else {
-        provider + "/"
-      })?,
+      IssuerUrl::new(config.oidc_provider.clone())?,
      async_http_client,
    )
-    .await?;
+    .await
+    .context(
+      "Failed to get OIDC /.well-known/openid-configuration",
+    )?;

    // Create an OpenID Connect client by specifying the client ID, client secret, authorization URL
    // and token URL.
--- a/bin/core/src/auth/oidc/mod.rs
+++ b/bin/core/src/auth/oidc/mod.rs
@@ -135,7 +135,9 @@ async fn callback(
      .context("CSRF Token invalid")?;

  if komodo_timestamp() > valid_until {
-    return Err(anyhow!("CSRF token invalid (Timed out). The token must be "));
+    return Err(anyhow!(
+      "CSRF token invalid (Timed out). The token must be "
+    ));
  }

  let token_response = client
@@ -191,20 +193,25 @@ async fn callback(
      if !no_users_exist && core_config.disable_user_registration {
        return Err(anyhow!("User registration is disabled"));
      }
-      // Email will use user_id if it isn't available.
-      let email = claims
-        .email()
-        .map(|email| email.as_str())
-        .unwrap_or(user_id);
-      let username = if core_config.oidc_use_full_email {
-        email
-      } else {
-        email
-          .split_once('@')
-          .map(|(username, _)| username)
-          .unwrap_or(email)
-      }
-      .to_string();
+      // Will use preferred_username, then email, then user_id if it isn't available.
+      let username = claims
+        .preferred_username()
+        .map(|username| username.to_string())
+        .unwrap_or_else(|| {
+          let email = claims
+            .email()
+            .map(|email| email.as_str())
+            .unwrap_or(user_id);
+          if core_config.oidc_use_full_email {
+            email
+          } else {
+            email
+              .split_once('@')
+              .map(|(username, _)| username)
+              .unwrap_or(email)
+          }
+          .to_string()
+        });
      let user = User {
        id: Default::default(),
        username,
--- a/client/core/rs/src/entities/config/core.rs
+++ b/client/core/rs/src/entities/config/core.rs
@@ -159,31 +159,31 @@ pub struct Env {
  pub komodo_github_webhook_app_pk_path: Option<String>,

  /// Override `database.uri`
-  #[serde(alias = "KOMODO_MONGO_URI")]
+  #[serde(alias = "komodo_mongo_uri")]
  pub komodo_database_uri: Option<String>,
  /// Override `database.uri` from file
-  #[serde(alias = "KOMODO_MONGO_URI_FILE")]
+  #[serde(alias = "komodo_mongo_uri_file")]
  pub komodo_database_uri_file: Option<PathBuf>,
  /// Override `database.address`
-  #[serde(alias = "KOMODO_MONGO_ADDRESS")]
+  #[serde(alias = "komodo_mongo_address")]
  pub komodo_database_address: Option<String>,
  /// Override `database.username`
-  #[serde(alias = "KOMODO_MONGO_USERNAME")]
+  #[serde(alias = "komodo_mongo_username")]
  pub komodo_database_username: Option<String>,
  /// Override `database.username` with file
-  #[serde(alias = "KOMODO_MONGO_USERNAME_FILE")]
+  #[serde(alias = "komodo_mongo_username_file")]
  pub komodo_database_username_file: Option<PathBuf>,
  /// Override `database.password`
-  #[serde(alias = "KOMODO_MONGO_PASSWORD")]
+  #[serde(alias = "komodo_mongo_password")]
  pub komodo_database_password: Option<String>,
  /// Override `database.password` with file
-  #[serde(alias = "KOMODO_MONGO_PASSWORD_FILE")]
+  #[serde(alias = "komodo_mongo_password_file")]
  pub komodo_database_password_file: Option<PathBuf>,
  /// Override `database.app_name`
-  #[serde(alias = "KOMODO_MONGO_APP_NAME")]
+  #[serde(alias = "komodo_mongo_app_name")]
  pub komodo_database_app_name: Option<String>,
  /// Override `database.db_name`
-  #[serde(alias = "KOMODO_MONGO_DB_NAME")]
+  #[serde(alias = "komodo_mongo_db_name")]
  pub komodo_database_db_name: Option<String>,

  /// Override `aws.access_key_id`
--- a/docsite/docs/setup/advanced.mdx
+++ b/docsite/docs/setup/advanced.mdx
@@ -1,15 +1,18 @@
 # Advanced Configuration

-### Oauth2
+### OIDC / Oauth2

 To enable OAuth2 login, you must create a client on the respective OAuth provider,
 for example [Github](https://docs.github.com/en/apps/oauth-apps/building-oauth-apps/creating-an-oauth-app)
 or [Google](https://developers.google.com/identity/protocols/oauth2).

+Komodo also supports self hosted Oauth2 providers like [Authentik](https://docs.goauthentik.io/docs/providers/oauth2/) or [Gitea](https://docs.gitea.com/development/oauth2-provider).
+
 - Komodo uses the `web application` login flow.
 - The redirect uri is:
 	- `<KOMODO_HOST>/auth/github/callback` for Github.
 	- `<KOMODO_HOST>/auth/google/callback` for Google.
+	- `<KOMODO_HOST>/auth/oidc/callback` for OIDC.

 ### Mount a config file

--- a/frontend/src/components/resources/stack/config.tsx
+++ b/frontend/src/components/resources/stack/config.tsx
@@ -693,6 +693,7 @@ export const StackConfig = ({
                  }
                  onValueChange={(file_contents) => set({ file_contents })}
                  language="yaml"
+                  readOnly={disabled}
                />
              );
            },
--- a/frontend/src/pages/home/dashboard.tsx
+++ b/frontend/src/pages/home/dashboard.tsx
@@ -27,9 +27,7 @@ export const Dashboard = () => {

  return (
    <>
-      <div className="mb-12">
-        <ActiveResources />
-      </div>
+      <ActiveResources />
      <Page
        title="Dashboard"
        icon={<Box className="w-8 h-8" />}
@@ -253,37 +251,39 @@ const ActiveResources = () => {
  if (resources.length === 0) return null;

  return (
-    <Section
-      title="Active"
-      icon={
-        <Circle className="w-4 h-4 stroke-none transition-colors fill-green-500" />
-      }
-    >
-      <DataTable
-        tableKey="active-resources"
-        data={resources}
-        columns={[
-          {
-            accessorKey: "name",
-            header: ({ column }) => (
-              <SortableHeader column={column} title="Name" />
-            ),
-            cell: ({ row }) => (
-              <ResourceLink type={row.original.type} id={row.original.id} />
-            ),
-          },
-          {
-            accessorKey: "type",
-            header: ({ column }) => (
-              <SortableHeader column={column} title="Resource" />
-            ),
-          },
-          {
-            header: "State",
-            cell: ({ row }) => row.original.state,
-          },
-        ]}
-      />
-    </Section>
+    <div className="mb-12">
+      <Section
+        title="Active"
+        icon={
+          <Circle className="w-4 h-4 stroke-none transition-colors fill-green-500" />
+        }
+      >
+        <DataTable
+          tableKey="active-resources"
+          data={resources}
+          columns={[
+            {
+              accessorKey: "name",
+              header: ({ column }) => (
+                <SortableHeader column={column} title="Name" />
+              ),
+              cell: ({ row }) => (
+                <ResourceLink type={row.original.type} id={row.original.id} />
+              ),
+            },
+            {
+              accessorKey: "type",
+              header: ({ column }) => (
+                <SortableHeader column={column} title="Resource" />
+              ),
+            },
+            {
+              header: "State",
+              cell: ({ row }) => row.original.state,
+            },
+          ]}
+        />
+      </Section>
+    </div>
  );
 };
--- a/readme.md
+++ b/readme.md
@@ -6,6 +6,8 @@ A tool to build and deploy software across many servers.

 🦎 [Try the Demo](https://demo.komo.do)

+🦎 [See the Build Server](https://build.komo.do)
+
 🦎 [Join the Discord](https://discord.gg/DRqE8Fvg5c)

 ## About
@@ -31,25 +33,21 @@ there are no warranties. Use at your own risk.
 ### Light Theme

 ![Dashboard](https://raw.githubusercontent.com/mbecker20/komodo/main/screenshots/Light-Dashboard.png)
-![Resources](https://raw.githubusercontent.com/mbecker20/komodo/main/screenshots/Light-Resources.png)
-![Deployment](https://raw.githubusercontent.com/mbecker20/komodo/main/screenshots/Light-Deployment.png)
-![Server](https://raw.githubusercontent.com/mbecker20/komodo/main/screenshots/Light-Server.png)
+![Stack](https://raw.githubusercontent.com/mbecker20/komodo/main/screenshots/Light-Stack.png)
+![Compose](https://raw.githubusercontent.com/mbecker20/komodo/main/screenshots/Light-Compose.png)
+![Env](https://raw.githubusercontent.com/mbecker20/komodo/main/screenshots/Light-Env.png)
 ![Sync](https://raw.githubusercontent.com/mbecker20/komodo/main/screenshots/Light-Sync.png)
-![Procedure](https://raw.githubusercontent.com/mbecker20/komodo/main/screenshots/Light-Procedure.png)
-![UserGroup](https://raw.githubusercontent.com/mbecker20/komodo/main/screenshots/Light-UserGroup.png)
 ![Update](https://raw.githubusercontent.com/mbecker20/komodo/main/screenshots/Light-Update.png)
-![Search](https://raw.githubusercontent.com/mbecker20/komodo/main/screenshots/Light-Search.png)
+![Stats](https://raw.githubusercontent.com/mbecker20/komodo/main/screenshots/Light-Stats.png)
 ![Export](https://raw.githubusercontent.com/mbecker20/komodo/main/screenshots/Light-Export.png)

 ### Dark Theme

 ![Dashboard](https://raw.githubusercontent.com/mbecker20/komodo/main/screenshots/Dark-Dashboard.png)
-![Resources](https://raw.githubusercontent.com/mbecker20/komodo/main/screenshots/Dark-Resources.png)
-![Deployment](https://raw.githubusercontent.com/mbecker20/komodo/main/screenshots/Dark-Deployment.png)
-![Server](https://raw.githubusercontent.com/mbecker20/komodo/main/screenshots/Dark-Server.png)
+![Stack](https://raw.githubusercontent.com/mbecker20/komodo/main/screenshots/Dark-Stack.png)
+![Compose](https://raw.githubusercontent.com/mbecker20/komodo/main/screenshots/Dark-Compose.png)
+![Env](https://raw.githubusercontent.com/mbecker20/komodo/main/screenshots/Dark-Env.png)
 ![Sync](https://raw.githubusercontent.com/mbecker20/komodo/main/screenshots/Dark-Sync.png)
-![Procedure](https://raw.githubusercontent.com/mbecker20/komodo/main/screenshots/Dark-Procedure.png)
-![UserGroup](https://raw.githubusercontent.com/mbecker20/komodo/main/screenshots/Dark-UserGroup.png)
 ![Update](https://raw.githubusercontent.com/mbecker20/komodo/main/screenshots/Dark-Update.png)
-![Search](https://raw.githubusercontent.com/mbecker20/komodo/main/screenshots/Dark-Search.png)
+![Stats](https://raw.githubusercontent.com/mbecker20/komodo/main/screenshots/Dark-Stats.png)
 ![Export](https://raw.githubusercontent.com/mbecker20/komodo/main/screenshots/Dark-Export.png)
--- a/screenshots/Dark-Compose.png
+++ b/screenshots/Dark-Compose.png
--- a/screenshots/Dark-Dashboard.png
+++ b/screenshots/Dark-Dashboard.png
--- a/screenshots/Dark-Deployment.png
+++ b/screenshots/Dark-Deployment.png
--- a/screenshots/Dark-Deployments.png
+++ b/screenshots/Dark-Deployments.png
--- a/screenshots/Dark-Env.png
+++ b/screenshots/Dark-Env.png
--- a/screenshots/Dark-Export.png
+++ b/screenshots/Dark-Export.png
--- a/screenshots/Dark-Procedure.png
+++ b/screenshots/Dark-Procedure.png
--- a/screenshots/Dark-Resources.png
+++ b/screenshots/Dark-Resources.png
--- a/screenshots/Dark-Search.png
+++ b/screenshots/Dark-Search.png
--- a/screenshots/Dark-Server.png
+++ b/screenshots/Dark-Server.png
--- a/screenshots/Dark-Stack.png
+++ b/screenshots/Dark-Stack.png
--- a/screenshots/Dark-Stats.png
+++ b/screenshots/Dark-Stats.png
--- a/screenshots/Dark-Sync.png
+++ b/screenshots/Dark-Sync.png
--- a/screenshots/Dark-Update.png
+++ b/screenshots/Dark-Update.png
--- a/screenshots/Dark-UserGroup.png
+++ b/screenshots/Dark-UserGroup.png
--- a/screenshots/Light-Compose.png
+++ b/screenshots/Light-Compose.png
--- a/screenshots/Light-Dashboard.png
+++ b/screenshots/Light-Dashboard.png
--- a/screenshots/Light-Deployment.png
+++ b/screenshots/Light-Deployment.png
--- a/screenshots/Light-Deployments.png
+++ b/screenshots/Light-Deployments.png
--- a/screenshots/Light-Env.png
+++ b/screenshots/Light-Env.png
--- a/screenshots/Light-Export.png
+++ b/screenshots/Light-Export.png
--- a/screenshots/Light-Procedure.png
+++ b/screenshots/Light-Procedure.png
--- a/screenshots/Light-Resources.png
+++ b/screenshots/Light-Resources.png
--- a/screenshots/Light-Search.png
+++ b/screenshots/Light-Search.png
--- a/screenshots/Light-Server.png
+++ b/screenshots/Light-Server.png
--- a/screenshots/Light-Stack.png
+++ b/screenshots/Light-Stack.png
--- a/screenshots/Light-Stats.png
+++ b/screenshots/Light-Stats.png
--- a/screenshots/Light-Sync.png
+++ b/screenshots/Light-Sync.png
--- a/screenshots/Light-Update.png
+++ b/screenshots/Light-Update.png
--- a/screenshots/Light-UserGroup.png
+++ b/screenshots/Light-UserGroup.png
Author	SHA1	Message	Date
mbecker20	3be2b5163b	1.15.1 do not add trailing slash OIDC provider	2024-10-07 13:23:40 -04:00
mbecker20	6a145f58ff	pass provider as-is. Authentik users should add a trailing slash	2024-10-07 13:16:25 -04:00
mbecker20	f1cede2ebd	update dark / light stack screenshot to have action buttons	2024-10-07 08:05:39 -04:00
mbecker20	a5cfa1d412	update screenshots	2024-10-07 07:30:18 -04:00
mbecker20	a0674654c1	update screenshots	2024-10-07 07:30:11 -04:00
mbecker20	3faa1c58c1	update screenshots	2024-10-07 07:30:05 -04:00
mbecker20	7e296f34af	screenshots	2024-10-07 07:29:58 -04:00
mbecker20	9f8ced190c	update screenshots	2024-10-07 07:29:02 -04:00
mbecker20	c194bb16d8	update screenshots	2024-10-07 07:28:45 -04:00
mbecker20	39fec9b55e	update screenshots	2024-10-07 07:27:52 -04:00
mbecker20	e97ed9888d	update screenshots 1	2024-10-07 07:27:16 -04:00
mbecker20	559102ffe3	update readme	2024-10-07 07:25:36 -04:00
mbecker20	6bf80ddcc7	update screenshots readme	2024-10-07 07:25:24 -04:00
mbecker20	89dbe1b4d9	stack file_contents editor respects readOnly / disabled	2024-10-07 06:58:00 -04:00
mbecker20	334e16d646	OIDC use preferred username	2024-10-07 06:35:46 -04:00
mbecker20	a7bbe519f4	add build server link	2024-10-07 06:15:53 -04:00
mbecker20	5827486c5a	add redirect uri for OIDC	2024-10-07 06:15:00 -04:00
mbecker20	8ca8f7eddd	add context to oidc init error	2024-10-07 06:10:12 -04:00
mbecker20	0600276b43	fix parse KOMODO_MONGO_ in envs	2024-10-07 05:43:09 -04:00
mbecker20	a77a1495c7	active resources mb-12 not always there	2024-10-07 05:14:54 -04:00