kitsune-soc · aumetra · Nov 11, 2023 · Oct 29, 2023 · Oct 29, 2023 · Oct 29, 2023
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/kitsune-core/src/service/account.rs b/crates/kitsune-core/src/service/account.rs
@@ -29,6 +29,7 @@ use futures_util::{Stream, TryStreamExt};
 use garde::Validate;
 use iso8601_timestamp::Timestamp;
 use kitsune_db::{
+    function::lower,
     model::{
         account::{Account, UpdateAccount},
         follower::Follow as DbFollow,
@@ -301,8 +302,8 @@ impl AccountService {
                     async move {
                         accounts::table
                             .filter(
-                                accounts::username
-                                    .eq(get_user.username)
+                                lower(accounts::username)
+                                    .eq(lower(get_user.username))
                                     .and(accounts::domain.eq(domain)),
                             )
                             .select(Account::as_select())
@@ -343,8 +344,8 @@ impl AccountService {
                     async move {
                         accounts::table
                             .filter(
-                                accounts::username
-                                    .eq(get_user.username)
+                                lower(accounts::username)
+                                    .eq(lower(get_user.username))
                                     .and(accounts::local.eq(true)),
                             )
                             .select(Account::as_select())
@@ -674,27 +675,31 @@ impl AccountService {
                 ..changeset
             };
         }
+
         if let Some(ref mut note) = update.note {
             note.clean_html();
             changeset = UpdateAccount {
                 note: Some(note),
                 ..changeset
             };
         }
+
         if let Some(avatar) = update.avatar {
             let media_attachment = self.attachment_service.upload(avatar).await?;
             changeset = UpdateAccount {
                 avatar_id: Some(media_attachment.id),
                 ..changeset
             };
         }
+
         if let Some(header) = update.header {
             let media_attachment = self.attachment_service.upload(header).await?;
             changeset = UpdateAccount {
                 header_id: Some(media_attachment.id),
                 ..changeset
             };
         }
+
         if let Some(locked) = update.locked {
             changeset = UpdateAccount {
                 locked: Some(locked),

diff --git a/crates/kitsune-core/src/service/attachment.rs b/crates/kitsune-core/src/service/attachment.rs
@@ -349,7 +349,7 @@ mod test {
     }
 
     async fn handle(_req: Request<Body>) -> Result<Response<Body>, Infallible> {
-        Ok::<_, Infallible>(Response::new(Body::from("")))
+        Ok::<_, Infallible>(Response::new(Body::empty()))
     }
 
     async fn prepare_db(db_conn: &mut AsyncPgConnection) -> Uuid {

diff --git a/crates/kitsune-db/migrations/2023-05-19-192931_initial_tables/up.sql b/crates/kitsune-db/migrations/2023-05-19-192931_initial_tables/up.sql
@@ -33,7 +33,7 @@ CREATE TABLE accounts (
     ) STORED NOT NULL,
 
     -- UNIQUE constraints
-    UNIQUE (username, domain)
+    UNIQUE (LOWER(username), domain)
 );
 
 CREATE TABLE accounts_follows (
@@ -88,7 +88,7 @@ CREATE TABLE users (
     updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
 
     -- UNIQUE constraints
-    UNIQUE (username, domain),
+    UNIQUE (LOWER(username), domain),
     UNIQUE (confirmation_token),
 
     -- Foreign key constraints

diff --git a/crates/kitsune-db/src/function.rs b/crates/kitsune-db/src/function.rs
@@ -16,6 +16,11 @@ sql_function! {
     fn iso_code_to_language(iso_code: LanguageIsoCode) -> RegConfig;
 }
 
+sql_function! {
+    /// Convert text to lowercase
+    fn lower(string: Text) -> Text;
+}
+
 sql_function! {
     /// Return the current date with the timezone
     fn now() -> Timestamptz;

diff --git a/kitsune-cli/src/role.rs b/kitsune-cli/src/role.rs
@@ -2,9 +2,12 @@ use crate::Result;
 use clap::{Args, Subcommand, ValueEnum};
 use diesel::{BelongingToDsl, BoolExpressionMethods, ExpressionMethods, QueryDsl};
 use diesel_async::{AsyncPgConnection, RunQueryDsl};
-use kitsune_db::model::{
-    user::User,
-    user_role::{NewUserRole, Role as DbRole, UserRole},
+use kitsune_db::{
+    function::lower,
+    model::{
+        user::User,
+        user_role::{NewUserRole, Role as DbRole, UserRole},
+    },
 };
 use speedy_uuid::Uuid;
 
@@ -77,7 +80,7 @@ async fn list_roles(db_conn: &mut AsyncPgConnection, username_str: &str) -> Resu
     use kitsune_db::schema::users;
 
     let user: User = users::table
-        .filter(users::username.eq(username_str))
+        .filter(lower(users::username).eq(lower(username_str)))
         .first(db_conn)
         .await?;
 
@@ -101,7 +104,7 @@ async fn remove_role(
     use kitsune_db::schema::{users, users_roles};
 
     let user = users::table
-        .filter(users::username.eq(username_str))
+        .filter(lower(users::username).eq(lower(username_str)))
         .first::<User>(db_conn)
         .await?;
 

diff --git a/kitsune/Cargo.toml b/kitsune/Cargo.toml
@@ -99,6 +99,8 @@ async-graphql-axum = { version = "6.0.9", optional = true }
 kitsune-oidc = { path = "../crates/kitsune-oidc", optional = true }
 
 [dev-dependencies]
+deadpool-redis = "0.13.0"
+kitsune-http-client = { path = "../crates/kitsune-http-client" }
 kitsune-test = { path = "../crates/kitsune-test" }
 pretty_assertions = "1.4.0"
 serial_test = "2.0.0"

diff --git a/kitsune/src/http/handler/oauth/authorize.rs b/kitsune/src/http/handler/oauth/authorize.rs
@@ -18,7 +18,7 @@ use axum_extra::{
 use axum_flash::{Flash, IncomingFlashes};
 use diesel::{ExpressionMethods, OptionalExtension, QueryDsl};
 use diesel_async::RunQueryDsl;
-use kitsune_db::{model::user::User, schema::users, PgPool};
+use kitsune_db::{function::lower, model::user::User, schema::users, PgPool};
 use oxide_auth_async::endpoint::authorization::AuthorizationFlow;
 use oxide_auth_axum::{OAuthRequest, OAuthResponse};
 use scoped_futures::ScopedFutureExt;
@@ -122,7 +122,7 @@ pub async fn post(
         .with_connection(|db_conn| {
             async move {
                 users::table
-                    .filter(users::username.eq(form.username))
+                    .filter(lower(users::username).eq(lower(form.username)))
                     .first::<User>(db_conn)
                     .await
                     .optional()