From 6a95b926e4c1e95f5fe5117c4b8c8fd3c63f2d51 Mon Sep 17 00:00:00 2001 From: SamTV12345 <40429738+samtv12345@users.noreply.github.com> Date: Sun, 7 Jan 2024 20:46:36 +0100 Subject: [PATCH 1/2] Return error if the currently created user is equal to the admin user. --- src/gpodder/auth/authentication.rs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/gpodder/auth/authentication.rs b/src/gpodder/auth/authentication.rs index ea4ee4c3..ccd8595d 100644 --- a/src/gpodder/auth/authentication.rs +++ b/src/gpodder/auth/authentication.rs @@ -46,12 +46,9 @@ pub async fn login( if let Some(admin_username) = &env.username { if admin_username == &unwrapped_username { - if let Some(admin_password) = &env.password { - if admin_password == &digest(password.clone()) { - return Ok(HttpResponse::Ok().json("Login successful")); - } + return Err(CustomError::Conflict("The user you are trying to login is equal to the admin user. Please\ + use another user to login.".to_string())); } - } } let user = User::find_by_username( From fdd2165e2c3516103837d94d0a2c06622dd34261 Mon Sep 17 00:00:00 2001 From: SamTV12345 <40429738+samtv12345@users.noreply.github.com> Date: Sun, 7 Jan 2024 20:49:21 +0100 Subject: [PATCH 2/2] Fixed --- .github/workflows/lint.yml | 1 + .github/workflows/pr-build.yml | 1 + .github/workflows/test.yml | 1 + 3 files changed, 3 insertions(+) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 5ed72e2e..061d1b48 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -5,6 +5,7 @@ on: pull_request: branches: - 'main' +name: Lint rust jobs: cargolint: diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml index d11f36ef..22ce39e8 100644 --- a/.github/workflows/pr-build.yml +++ b/.github/workflows/pr-build.yml @@ -1,4 +1,5 @@ on: [pull_request] +name: Test rust jobs: build_and_test: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 05b9c6bf..5a823d16 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -7,6 +7,7 @@ on: pull_request: paths: - 'src/**' +name: Test rust jobs: build_and_test: