Merge pull request #74 from ISibboI/67-provide-a-command-to-expire-al…

…l-passwords Provide a command to expire all passwords
ISibboI · Oct 25, 2023 · e3a0c79 · e3a0c79
2 parents a49ba98 + bf2be51
commit e3a0c79
Show file tree

Hide file tree

Showing 18 changed files with 432 additions and 232 deletions.
diff --git a/backend/api_commands/src/lib.rs b/backend/api_commands/src/lib.rs
@@ -6,13 +6,13 @@ use serde::{Deserialize, Serialize};
 
 #[derive(Serialize, Deserialize, Debug, Eq, PartialEq)]
 pub struct CreateAccount {
-    pub name: String,
+    pub username: String,
     pub password: SecBytes,
 }
 
 #[derive(Serialize, Deserialize, Debug, Eq, PartialEq)]
 pub struct Login {
-    pub name: String,
+    pub username: String,
     pub password: SecBytes,
 }
 
@@ -23,7 +23,7 @@ mod tests {
     #[test]
     fn test_serde_create_account() {
         let create_account = CreateAccount {
-            name: "anne".to_owned(),
+            username: "anne".to_owned(),
             password: "frank".to_owned().into(),
         };
 

diff --git a/backend/integration-tests/src/main.rs b/backend/integration-tests/src/main.rs
@@ -78,7 +78,7 @@ async fn test_user_account_creation() -> anyhow::Result<()> {
         .post(
             "/accounts/create",
             CreateAccount {
-                name: "anne".to_owned(),
+                username: "anne".to_owned(),
                 password: "frank😀😀😀".to_owned().into(),
             },
         )
@@ -93,7 +93,7 @@ async fn test_duplicate_user_account_creation() -> anyhow::Result<()> {
         .post(
             "/accounts/create",
             CreateAccount {
-                name: "rosa".to_owned(),
+                username: "rosa".to_owned(),
                 password: "luxemburg".to_owned().into(),
             },
         )
@@ -105,7 +105,7 @@ async fn test_duplicate_user_account_creation() -> anyhow::Result<()> {
         .post(
             "/accounts/create",
             CreateAccount {
-                name: "rosa".to_owned(),
+                username: "rosa".to_owned(),
                 password: "luxemburg".to_owned().into(),
             },
         )
@@ -120,7 +120,7 @@ async fn test_user_account_deletion() -> anyhow::Result<()> {
         .post(
             "/accounts/create",
             CreateAccount {
-                name: "claus".to_owned(),
+                username: "claus".to_owned(),
                 password: "von stauffenberg".to_owned().into(),
             },
         )
@@ -136,7 +136,7 @@ async fn test_user_account_deletion() -> anyhow::Result<()> {
         .post(
             "/accounts/login",
             Login {
-                name: "claus".to_owned(),
+                username: "claus".to_owned(),
                 password: "von stauffenberg".to_owned().into(),
             },
         )
@@ -157,7 +157,7 @@ async fn test_login_logout() -> anyhow::Result<()> {
         .post(
             "/accounts/create",
             CreateAccount {
-                name: "orli".to_owned(),
+                username: "orli".to_owned(),
                 password: password.clone(),
             },
         )
@@ -173,7 +173,7 @@ async fn test_login_logout() -> anyhow::Result<()> {
         .post(
             "/accounts/login",
             Login {
-                name: "orli".to_owned(),
+                username: "orli".to_owned(),
                 password: password.clone(),
             },
         )
@@ -196,7 +196,7 @@ async fn test_wrong_password() -> anyhow::Result<()> {
         .post(
             "/accounts/create",
             CreateAccount {
-                name: "lothar".to_owned(),
+                username: "lothar".to_owned(),
                 password: "kreyssig".to_owned().into(),
             },
         )
@@ -209,7 +209,7 @@ async fn test_wrong_password() -> anyhow::Result<()> {
         .post(
             "/accounts/login",
             Login {
-                name: "lothar".to_owned(),
+                username: "lothar".to_owned(),
                 password: "anders++".to_owned().into(),
             },
         )
@@ -222,7 +222,7 @@ async fn test_wrong_password() -> anyhow::Result<()> {
         .post(
             "/accounts/login",
             Login {
-                name: "lothar".to_owned(),
+                username: "lothar".to_owned(),
                 password: "kreyssig".to_owned().into(),
             },
         )
@@ -235,7 +235,7 @@ async fn test_wrong_password() -> anyhow::Result<()> {
         .post(
             "/accounts/login",
             Login {
-                name: "lothar".to_owned(),
+                username: "lothar".to_owned(),
                 password: "anders".to_owned().into(),
             },
         )
@@ -252,7 +252,7 @@ async fn test_wrong_password() -> anyhow::Result<()> {
         .post(
             "/accounts/login",
             Login {
-                name: "lothar".to_owned(),
+                username: "lothar".to_owned(),
                 password: "kreyssig".to_owned().into(),
             },
         )
@@ -275,8 +275,9 @@ async fn test_too_long_username() -> anyhow::Result<()> {
         .post(
             "/accounts/create",
             CreateAccount {
-                name: "else-else-else-else-else-else-else-else-else-else-else-else-else-else-else"
-                    .to_owned(),
+                username:
+                    "else-else-else-else-else-else-else-else-else-else-else-else-else-else-else"
+                        .to_owned(),
                 password: "hirsch😀😀".to_owned().into(),
             },
         )
@@ -291,7 +292,7 @@ async fn test_too_long_password() -> anyhow::Result<()> {
         .post(
             "/accounts/create",
             CreateAccount {
-                name: "josef"
+                username: "josef"
                     .to_owned(),
                 password: "höhn-höhn-höhn-höhn-höhn-höhn-höhn-höhn-höhn-höhn-höhn-höhn-höhn-höhn-höhn-höhn-höhn-höhn-höhn-höhn-höhn-höhn-höhn-höhn-höhn-höhn-höhn-höhn-höhn-höhn-höhn".to_owned().into(),
             },
@@ -307,7 +308,7 @@ async fn test_too_short_username() -> anyhow::Result<()> {
         .post(
             "/accounts/create",
             CreateAccount {
-                name: "K.".to_owned(),
+                username: "K.".to_owned(),
                 password: "ibach😀😀😀".to_owned().into(),
             },
         )
@@ -322,7 +323,7 @@ async fn test_too_short_password() -> anyhow::Result<()> {
         .post(
             "/accounts/create",
             CreateAccount {
-                name: "hans".to_owned(),
+                username: "hans".to_owned(),
                 password: "ils".to_owned().into(),
             },
         )
@@ -337,7 +338,7 @@ async fn test_wrong_username_login() -> anyhow::Result<()> {
         .post(
             "/accounts/login",
             Login {
-                name: "peter".to_owned(),
+                username: "peter".to_owned(),
                 password: "hüppeler".to_owned().into(),
             },
         )
@@ -352,7 +353,7 @@ async fn test_too_long_password_login() -> anyhow::Result<()> {
         .post(
             "/accounts/create",
             CreateAccount {
-                name: "alois".to_owned(),
+                username: "alois".to_owned(),
                 password: "hundhammer".to_owned().into(),
             },
         )
@@ -364,7 +365,7 @@ async fn test_too_long_password_login() -> anyhow::Result<()> {
         .post(
             "/accounts/login",
             Login {
-                name: "alois".to_owned(),
+                username: "alois".to_owned(),
                 password: "hundhammer-hundhammer-hundhammer-hundhammer-hundhammer-hundhammer-hundhammer-hundhammer-hundhammer-hundhammer-hundhammer-hundhammer".to_owned().into(),
             },
         )

diff --git a/backend/rvoc-backend/Cargo.toml b/backend/rvoc-backend/Cargo.toml
@@ -5,6 +5,8 @@ edition.workspace = true
 rust-version.workspace = true
 publish = false
 
+default-run = "rvoc-backend"
+
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [[bin]]
@@ -31,7 +33,7 @@ opentelemetry-otlp = { version = "0.13.0" }
 thiserror = "1.0.50"
 
 # database
-diesel = { version = "2.1.0", features = ["postgres", "chrono"] }
+diesel = { version = "2.1.3", features = ["postgres", "chrono"] }
 diesel_migrations = "2.1.0"
 diesel-async = { version = "0.4.1", features = ["postgres", "deadpool"] }
 

diff --git a/backend/rvoc-backend/migrations/2023-08-24-100631_add_password_column_to_user_table/up.sql b/backend/rvoc-backend/migrations/2023-08-24-100631_add_password_column_to_user_table/up.sql
@@ -1 +1 @@
-ALTER TABLE users ADD COLUMN password_hash TEXT NOT NULL;
+ALTER TABLE users ADD COLUMN password_hash TEXT;
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		ALTER TABLE users ADD COLUMN password_hash TEXT NOT NULL;
		ALTER TABLE users ADD COLUMN password_hash TEXT;