Skip to content

fix: update traefik config when auth password changes #3538

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
HarnesHa12 wants to merge 1 commit into
base: canary
Choose a base branch
from
Open

fix: update traefik config when auth password changes #3538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 24 additions & 10 deletions packages/server/src/services/security.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { db } from "@dokploy/server/db";
import { type apiCreateSecurity, security } from "@dokploy/server/db/schema";
import {
createSecurityMiddleware,
removeSecurityMiddleware,
updateSecurityMiddleware,
} from "@dokploy/server/utils/traefik/security";
import { TRPCError } from "@trpc/server";
import { eq } from "drizzle-orm";
Expand Down Expand Up @@ -44,7 +44,7 @@ export const createSecurity = async (
message: "Error creating the security",
});
}
await createSecurityMiddleware(application, securityResponse);
await updateSecurityMiddleware(application, securityResponse);
return true;
});
} catch (error) {
Expand Down Expand Up @@ -90,15 +90,29 @@ export const updateSecurityById = async (
data: Partial<Security>,
) => {
try {
const response = await db
.update(security)
.set({
...data,
})
.where(eq(security.securityId, securityId))
.returning();
await db.transaction(async (tx) => {
const result = await tx
.update(security)
.set({
...data,
})
.where(eq(security.securityId, securityId))
.returning()
.then((res) => res[0]);

return response[0];
if (!result) {
throw new TRPCError({
code: "NOT_FOUND",
message: "Security not found",
});
}

const application = await findApplicationById(result.applicationId);

await updateSecurityMiddleware(application, result);

return result;
});
} catch (error) {
const message =
error instanceof Error ? error.message : "Error updating this security";
Expand Down
12 changes: 7 additions & 5 deletions packages/server/src/utils/traefik/security.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import {
writeMiddleware,
} from "./middleware";

export const createSecurityMiddleware = async (
export const updateSecurityMiddleware = async (
application: ApplicationNested,
data: Security,
) => {
Expand All @@ -39,10 +39,12 @@ export const createSecurityMiddleware = async (
if (config.http?.middlewares) {
const currentMiddleware = config.http.middlewares[middlewareName];
if (isBasicAuthMiddleware(currentMiddleware)) {
currentMiddleware.basicAuth.users = [
...(currentMiddleware.basicAuth.users || []),
user,
];
const users = currentMiddleware.basicAuth.users;
const filteredUsers = users?.filter((user) => {
const [username] = user.split(":");
return username !== data.username;
});
currentMiddleware.basicAuth.users = [...(filteredUsers || []), user];
} else {
config.http.middlewares[middlewareName] = {
basicAuth: {
Expand Down