diff options
author | Dessalines <tyhou13@gmx.com> | 2020-01-12 10:31:51 -0500 |
---|---|---|
committer | Dessalines <tyhou13@gmx.com> | 2020-01-12 10:31:51 -0500 |
commit | dff8b947bb779d27d4b5953fe1f34166ac5c4104 (patch) | |
tree | 2cad663e4ef1689ae741cbce995be42095a8c500 /server/src/api | |
parent | 677d716ae6b21ecb0569d661c1d76520dade1643 (diff) |
Trying to add r2d2 connection pooling to websockets.
Diffstat (limited to 'server/src/api')
-rw-r--r-- | server/src/api/comment.rs | 13 | ||||
-rw-r--r-- | server/src/api/community.rs | 29 | ||||
-rw-r--r-- | server/src/api/mod.rs | 3 | ||||
-rw-r--r-- | server/src/api/post.rs | 20 | ||||
-rw-r--r-- | server/src/api/site.rs | 22 | ||||
-rw-r--r-- | server/src/api/user.rs | 40 |
6 files changed, 46 insertions, 81 deletions
diff --git a/server/src/api/comment.rs b/server/src/api/comment.rs index 62759578..61cc9506 100644 --- a/server/src/api/comment.rs +++ b/server/src/api/comment.rs @@ -1,6 +1,7 @@ use super::*; use crate::send_email; use crate::settings::Settings; +use diesel::PgConnection; #[derive(Serialize, Deserialize)] pub struct CreateComment { @@ -47,9 +48,8 @@ pub struct CreateCommentLike { } impl Perform<CommentResponse> for Oper<CreateComment> { - fn perform(&self) -> Result<CommentResponse, Error> { + fn perform(&self, conn: &PgConnection) -> Result<CommentResponse, Error> { let data: &CreateComment = &self.data; - let conn = establish_connection(); let claims = match Claims::decode(&data.auth) { Ok(claims) => claims.claims, @@ -206,9 +206,8 @@ impl Perform<CommentResponse> for Oper<CreateComment> { } impl Perform<CommentResponse> for Oper<EditComment> { - fn perform(&self) -> Result<CommentResponse, Error> { + fn perform(&self, conn: &PgConnection) -> Result<CommentResponse, Error> { let data: &EditComment = &self.data; - let conn = establish_connection(); let claims = match Claims::decode(&data.auth) { Ok(claims) => claims.claims, @@ -318,9 +317,8 @@ impl Perform<CommentResponse> for Oper<EditComment> { } impl Perform<CommentResponse> for Oper<SaveComment> { - fn perform(&self) -> Result<CommentResponse, Error> { + fn perform(&self, conn: &PgConnection) -> Result<CommentResponse, Error> { let data: &SaveComment = &self.data; - let conn = establish_connection(); let claims = match Claims::decode(&data.auth) { Ok(claims) => claims.claims, @@ -356,9 +354,8 @@ impl Perform<CommentResponse> for Oper<SaveComment> { } impl Perform<CommentResponse> for Oper<CreateCommentLike> { - fn perform(&self) -> Result<CommentResponse, Error> { + fn perform(&self, conn: &PgConnection) -> Result<CommentResponse, Error> { let data: &CreateCommentLike = &self.data; - let conn = establish_connection(); let claims = match Claims::decode(&data.auth) { Ok(claims) => claims.claims, diff --git a/server/src/api/community.rs b/server/src/api/community.rs index a1109c03..0bf846c3 100644 --- a/server/src/api/community.rs +++ b/server/src/api/community.rs @@ -1,4 +1,5 @@ use super::*; +use diesel::PgConnection; use std::str::FromStr; #[derive(Serialize, Deserialize)] @@ -118,9 +119,8 @@ pub struct TransferCommunity { } impl Perform<GetCommunityResponse> for Oper<GetCommunity> { - fn perform(&self) -> Result<GetCommunityResponse, Error> { + fn perform(&self, conn: &PgConnection) -> Result<GetCommunityResponse, Error> { let data: &GetCommunity = &self.data; - let conn = establish_connection(); let user_id: Option<i32> = match &data.auth { Some(auth) => match Claims::decode(&auth) { @@ -173,9 +173,8 @@ impl Perform<GetCommunityResponse> for Oper<GetCommunity> { } impl Perform<CommunityResponse> for Oper<CreateCommunity> { - fn perform(&self) -> Result<CommunityResponse, Error> { + fn perform(&self, conn: &PgConnection) -> Result<CommunityResponse, Error> { let data: &CreateCommunity = &self.data; - let conn = establish_connection(); let claims = match Claims::decode(&data.auth) { Ok(claims) => claims.claims, @@ -248,15 +247,13 @@ impl Perform<CommunityResponse> for Oper<CreateCommunity> { } impl Perform<CommunityResponse> for Oper<EditCommunity> { - fn perform(&self) -> Result<CommunityResponse, Error> { + fn perform(&self, conn: &PgConnection) -> Result<CommunityResponse, Error> { let data: &EditCommunity = &self.data; if has_slurs(&data.name) || has_slurs(&data.title) { return Err(APIError::err(&self.op, "no_slurs").into()); } - let conn = establish_connection(); - let claims = match Claims::decode(&data.auth) { Ok(claims) => claims.claims, Err(_e) => return Err(APIError::err(&self.op, "not_logged_in").into()), @@ -325,9 +322,8 @@ impl Perform<CommunityResponse> for Oper<EditCommunity> { } impl Perform<ListCommunitiesResponse> for Oper<ListCommunities> { - fn perform(&self) -> Result<ListCommunitiesResponse, Error> { + fn perform(&self, conn: &PgConnection) -> Result<ListCommunitiesResponse, Error> { let data: &ListCommunities = &self.data; - let conn = establish_connection(); let user_claims: Option<Claims> = match &data.auth { Some(auth) => match Claims::decode(&auth) { @@ -366,9 +362,8 @@ impl Perform<ListCommunitiesResponse> for Oper<ListCommunities> { } impl Perform<CommunityResponse> for Oper<FollowCommunity> { - fn perform(&self) -> Result<CommunityResponse, Error> { + fn perform(&self, conn: &PgConnection) -> Result<CommunityResponse, Error> { let data: &FollowCommunity = &self.data; - let conn = establish_connection(); let claims = match Claims::decode(&data.auth) { Ok(claims) => claims.claims, @@ -404,9 +399,8 @@ impl Perform<CommunityResponse> for Oper<FollowCommunity> { } impl Perform<GetFollowedCommunitiesResponse> for Oper<GetFollowedCommunities> { - fn perform(&self) -> Result<GetFollowedCommunitiesResponse, Error> { + fn perform(&self, conn: &PgConnection) -> Result<GetFollowedCommunitiesResponse, Error> { let data: &GetFollowedCommunities = &self.data; - let conn = establish_connection(); let claims = match Claims::decode(&data.auth) { Ok(claims) => claims.claims, @@ -430,9 +424,8 @@ impl Perform<GetFollowedCommunitiesResponse> for Oper<GetFollowedCommunities> { } impl Perform<BanFromCommunityResponse> for Oper<BanFromCommunity> { - fn perform(&self) -> Result<BanFromCommunityResponse, Error> { + fn perform(&self, conn: &PgConnection) -> Result<BanFromCommunityResponse, Error> { let data: &BanFromCommunity = &self.data; - let conn = establish_connection(); let claims = match Claims::decode(&data.auth) { Ok(claims) => claims.claims, @@ -485,9 +478,8 @@ impl Perform<BanFromCommunityResponse> for Oper<BanFromCommunity> { } impl Perform<AddModToCommunityResponse> for Oper<AddModToCommunity> { - fn perform(&self) -> Result<AddModToCommunityResponse, Error> { + fn perform(&self, conn: &PgConnection) -> Result<AddModToCommunityResponse, Error> { let data: &AddModToCommunity = &self.data; - let conn = establish_connection(); let claims = match Claims::decode(&data.auth) { Ok(claims) => claims.claims, @@ -536,9 +528,8 @@ impl Perform<AddModToCommunityResponse> for Oper<AddModToCommunity> { } impl Perform<GetCommunityResponse> for Oper<TransferCommunity> { - fn perform(&self) -> Result<GetCommunityResponse, Error> { + fn perform(&self, conn: &PgConnection) -> Result<GetCommunityResponse, Error> { let data: &TransferCommunity = &self.data; - let conn = establish_connection(); let claims = match Claims::decode(&data.auth) { Ok(claims) => claims.claims, diff --git a/server/src/api/mod.rs b/server/src/api/mod.rs index 07712e87..e3580447 100644 --- a/server/src/api/mod.rs +++ b/server/src/api/mod.rs @@ -16,6 +16,7 @@ use crate::db::user_mention_view::*; use crate::db::user_view::*; use crate::db::*; use crate::{extract_usernames, has_slurs, naive_from_unix, naive_now, remove_slurs}; +use diesel::PgConnection; use failure::Error; use serde::{Deserialize, Serialize}; @@ -96,7 +97,7 @@ impl<T> Oper<T> { } pub trait Perform<T> { - fn perform(&self) -> Result<T, Error> + fn perform(&self, conn: &PgConnection) -> Result<T, Error> where T: Sized; } diff --git a/server/src/api/post.rs b/server/src/api/post.rs index 5bc31def..b0fcdd0c 100644 --- a/server/src/api/post.rs +++ b/server/src/api/post.rs @@ -1,4 +1,5 @@ use super::*; +use diesel::PgConnection; use std::str::FromStr; #[derive(Serialize, Deserialize)] @@ -87,9 +88,8 @@ pub struct SavePost { } impl Perform<PostResponse> for Oper<CreatePost> { - fn perform(&self) -> Result<PostResponse, Error> { + fn perform(&self, conn: &PgConnection) -> Result<PostResponse, Error> { let data: &CreatePost = &self.data; - let conn = establish_connection(); let claims = match Claims::decode(&data.auth) { Ok(claims) => claims.claims, @@ -158,9 +158,8 @@ impl Perform<PostResponse> for Oper<CreatePost> { } impl Perform<GetPostResponse> for Oper<GetPost> { - fn perform(&self) -> Result<GetPostResponse, Error> { + fn perform(&self, conn: &PgConnection) -> Result<GetPostResponse, Error> { let data: &GetPost = &self.data; - let conn = establish_connection(); let user_id: Option<i32> = match &data.auth { Some(auth) => match Claims::decode(&auth) { @@ -207,9 +206,8 @@ impl Perform<GetPostResponse> for Oper<GetPost> { } impl Perform<GetPostsResponse> for Oper<GetPosts> { - fn perform(&self) -> Result<GetPostsResponse, Error> { + fn perform(&self, conn: &PgConnection) -> Result<GetPostsResponse, Error> { let data: &GetPosts = &self.data; - let conn = establish_connection(); let user_claims: Option<Claims> = match &data.auth { Some(auth) => match Claims::decode(&auth) { @@ -254,9 +252,8 @@ impl Perform<GetPostsResponse> for Oper<GetPosts> { } impl Perform<CreatePostLikeResponse> for Oper<CreatePostLike> { - fn perform(&self) -> Result<CreatePostLikeResponse, Error> { + fn perform(&self, conn: &PgConnection) -> Result<CreatePostLikeResponse, Error> { let data: &CreatePostLike = &self.data; - let conn = establish_connection(); let claims = match Claims::decode(&data.auth) { Ok(claims) => claims.claims, @@ -316,14 +313,12 @@ impl Perform<CreatePostLikeResponse> for Oper<CreatePostLike> { } impl Perform<PostResponse> for Oper<EditPost> { - fn perform(&self) -> Result<PostResponse, Error> { + fn perform(&self, conn: &PgConnection) -> Result<PostResponse, Error> { let data: &EditPost = &self.data; if has_slurs(&data.name) || (data.body.is_some() && has_slurs(&data.body.to_owned().unwrap())) { return Err(APIError::err(&self.op, "no_slurs").into()); } - let conn = establish_connection(); - let claims = match Claims::decode(&data.auth) { Ok(claims) => claims.claims, Err(_e) => return Err(APIError::err(&self.op, "not_logged_in").into()), @@ -412,9 +407,8 @@ impl Perform<PostResponse> for Oper<EditPost> { } impl Perform<PostResponse> for Oper<SavePost> { - fn perform(&self) -> Result<PostResponse, Error> { + fn perform(&self, conn: &PgConnection) -> Result<PostResponse, Error> { let data: &SavePost = &self.data; - let conn = establish_connection(); let claims = match Claims::decode(&data.auth) { Ok(claims) => claims.claims, diff --git a/server/src/api/site.rs b/server/src/api/site.rs index 58c34e8f..a189a030 100644 --- a/server/src/api/site.rs +++ b/server/src/api/site.rs @@ -1,4 +1,5 @@ use super::*; +use diesel::PgConnection; use std::str::FromStr; #[derive(Serialize, Deserialize)] @@ -97,9 +98,8 @@ pub struct TransferSite { } impl Perform<ListCategoriesResponse> for Oper<ListCategories> { - fn perform(&self) -> Result<ListCategoriesResponse, Error> { + fn perform(&self, conn: &PgConnection) -> Result<ListCategoriesResponse, Error> { let _data: &ListCategories = &self.data; - let conn = establish_connection(); let categories: Vec<Category> = Category::list_all(&conn)?; @@ -112,9 +112,8 @@ impl Perform<ListCategoriesResponse> for Oper<ListCategories> { } impl Perform<GetModlogResponse> for Oper<GetModlog> { - fn perform(&self) -> Result<GetModlogResponse, Error> { + fn perform(&self, conn: &PgConnection) -> Result<GetModlogResponse, Error> { let data: &GetModlog = &self.data; - let conn = establish_connection(); let removed_posts = ModRemovePostView::list( &conn, @@ -187,9 +186,8 @@ impl Perform<GetModlogResponse> for Oper<GetModlog> { } impl Perform<SiteResponse> for Oper<CreateSite> { - fn perform(&self) -> Result<SiteResponse, Error> { + fn perform(&self, conn: &PgConnection) -> Result<SiteResponse, Error> { let data: &CreateSite = &self.data; - let conn = establish_connection(); let claims = match Claims::decode(&data.auth) { Ok(claims) => claims.claims, @@ -234,9 +232,8 @@ impl Perform<SiteResponse> for Oper<CreateSite> { } impl Perform<SiteResponse> for Oper<EditSite> { - fn perform(&self) -> Result<SiteResponse, Error> { + fn perform(&self, conn: &PgConnection) -> Result<SiteResponse, Error> { let data: &EditSite = &self.data; - let conn = establish_connection(); let claims = match Claims::decode(&data.auth) { Ok(claims) => claims.claims, @@ -283,9 +280,8 @@ impl Perform<SiteResponse> for Oper<EditSite> { } impl Perform<GetSiteResponse> for Oper<GetSite> { - fn perform(&self) -> Result<GetSiteResponse, Error> { + fn perform(&self, conn: &PgConnection) -> Result<GetSiteResponse, Error> { let _data: &GetSite = &self.data; - let conn = establish_connection(); // It can return a null site in order to redirect let site_view = match Site::read(&conn, 1) { @@ -314,9 +310,8 @@ impl Perform<GetSiteResponse> for Oper<GetSite> { } impl Perform<SearchResponse> for Oper<Search> { - fn perform(&self) -> Result<SearchResponse, Error> { + fn perform(&self, conn: &PgConnection) -> Result<SearchResponse, Error> { let data: &Search = &self.data; - let conn = establish_connection(); let sort = SortType::from_str(&data.sort)?; let type_ = SearchType::from_str(&data.type_)?; @@ -419,9 +414,8 @@ impl Perform<SearchResponse> for Oper<Search> { } impl Perform<GetSiteResponse> for Oper<TransferSite> { - fn perform(&self) -> Result<GetSiteResponse, Error> { + fn perform(&self, conn: &PgConnection) -> Result<GetSiteResponse, Error> { let data: &TransferSite = &self.data; - let conn = establish_connection(); let claims = match Claims::decode(&data.auth) { Ok(claims) => claims.claims, diff --git a/server/src/api/user.rs b/server/src/api/user.rs index 41729eb7..20eb09c1 100644 --- a/server/src/api/user.rs +++ b/server/src/api/user.rs @@ -2,6 +2,7 @@ use super::*; use crate::settings::Settings; use crate::{generate_random_string, send_email}; use bcrypt::verify; +use diesel::PgConnection; use std::str::FromStr; #[derive(Serialize, Deserialize, Debug)] @@ -167,9 +168,8 @@ pub struct PasswordChange { } impl Perform<LoginResponse> for Oper<Login> { - fn perform(&self) -> Result<LoginResponse, Error> { + fn perform(&self, conn: &PgConnection) -> Result<LoginResponse, Error> { let data: &Login = &self.data; - let conn = establish_connection(); // Fetch that username / email let user: User_ = match User_::find_by_email_or_username(&conn, &data.username_or_email) { @@ -192,9 +192,8 @@ impl Perform<LoginResponse> for Oper<Login> { } impl Perform<LoginResponse> for Oper<Register> { - fn perform(&self) -> Result<LoginResponse, Error> { + fn perform(&self, conn: &PgConnection) -> Result<LoginResponse, Error> { let data: &Register = &self.data; - let conn = establish_connection(); // Make sure site has open registration if let Ok(site) = SiteView::read(&conn) { @@ -299,9 +298,8 @@ impl Perform<LoginResponse> for Oper<Register> { } impl Perform<LoginResponse> for Oper<SaveUserSettings> { - fn perform(&self) -> Result<LoginResponse, Error> { + fn perform(&self, conn: &PgConnection) -> Result<LoginResponse, Error> { let data: &SaveUserSettings = &self.data; - let conn = establish_connection(); let claims = match Claims::decode(&data.auth) { Ok(claims) => claims.claims, @@ -378,9 +376,8 @@ impl Perform<LoginResponse> for Oper<SaveUserSettings> { } impl Perform<GetUserDetailsResponse> for Oper<GetUserDetails> { - fn perform(&self) -> Result<GetUserDetailsResponse, Error> { + fn perform(&self, conn: &PgConnection) -> Result<GetUserDetailsResponse, Error> { let data: &GetUserDetails = &self.data; - let conn = establish_connection(); let user_claims: Option<Claims> = match &data.auth { Some(auth) => match Claims::decode(&auth) { @@ -470,9 +467,8 @@ impl Perform<GetUserDetailsResponse> for Oper<GetUserDetails> { } impl Perform<AddAdminResponse> for Oper<AddAdmin> { - fn perform(&self) -> Result<AddAdminResponse, Error> { + fn perform(&self, conn: &PgConnection) -> Result<AddAdminResponse, Error> { let data: &AddAdmin = &self.data; - let conn = establish_connection(); let claims = match Claims::decode(&data.auth) { Ok(claims) => claims.claims, @@ -535,9 +531,8 @@ impl Perform<AddAdminResponse> for Oper<AddAdmin> { } impl Perform<BanUserResponse> for Oper<BanUser> { - fn perform(&self) -> Result<BanUserResponse, Error> { + fn perform(&self, conn: &PgConnection) -> Result<BanUserResponse, Error> { let data: &BanUser = &self.data; - let conn = establish_connection(); let claims = match Claims::decode(&data.auth) { Ok(claims) => claims.claims, @@ -604,9 +599,8 @@ impl Perform<BanUserResponse> for Oper<BanUser> { } impl Perform<GetRepliesResponse> for Oper<GetReplies> { - fn perform(&self) -> Result<GetRepliesResponse, Error> { + fn perform(&self, conn: &PgConnection) -> Result<GetRepliesResponse, Error> { let data: &GetReplies = &self.data; - let conn = establish_connection(); let claims = match Claims::decode(&data.auth) { Ok(claims) => claims.claims, @@ -632,9 +626,8 @@ impl Perform<GetRepliesResponse> for Oper<GetReplies> { } impl Perform<GetUserMentionsResponse> for Oper<GetUserMentions> { - fn perform(&self) -> Result<GetUserMentionsResponse, Error> { + fn perform(&self, conn: &PgConnection) -> Result<GetUserMentionsResponse, Error> { let data: &GetUserMentions = &self.data; - let conn = establish_connection(); let claims = match Claims::decode(&data.auth) { Ok(claims) => claims.claims, @@ -660,9 +653,8 @@ impl Perform<GetUserMentionsResponse> for Oper<GetUserMentions> { } impl Perform<UserMentionResponse> for Oper<EditUserMention> { - fn perform(&self) -> Result<UserMentionResponse, Error> { + fn perform(&self, conn: &PgConnection) -> Result<UserMentionResponse, Error> { let data: &EditUserMention = &self.data; - let conn = establish_connection(); let claims = match Claims::decode(&data.auth) { Ok(claims) => claims.claims, @@ -695,9 +687,8 @@ impl Perform<UserMentionResponse> for Oper<EditUserMention> { } impl Perform<GetRepliesResponse> for Oper<MarkAllAsRead> { - fn perform(&self) -> Result<GetRepliesResponse, Error> { + fn perform(&self, conn: &PgConnection) -> Result<GetRepliesResponse, Error> { let data: &MarkAllAsRead = &self.data; - let conn = establish_connection(); let claims = match Claims::decode(&data.auth) { Ok(claims) => claims.claims, @@ -759,9 +750,8 @@ impl Perform<GetRepliesResponse> for Oper<MarkAllAsRead> { } impl Perform<LoginResponse> for Oper<DeleteAccount> { - fn perform(&self) -> Result<LoginResponse, Error> { + fn perform(&self, conn: &PgConnection) -> Result<LoginResponse, Error> { let data: &DeleteAccount = &self.data; - let conn = establish_connection(); let claims = match Claims::decode(&data.auth) { Ok(claims) => claims.claims, @@ -838,9 +828,8 @@ impl Perform<LoginResponse> for Oper<DeleteAccount> { } impl Perform<PasswordResetResponse> for Oper<PasswordReset> { - fn perform(&self) -> Result<PasswordResetResponse, Error> { + fn perform(&self, conn: &PgConnection) -> Result<PasswordResetResponse, Error> { let data: &PasswordReset = &self.data; - let conn = establish_connection(); // Fetch that email let user: User_ = match User_::find_by_email(&conn, &data.email) { @@ -872,9 +861,8 @@ impl Perform<PasswordResetResponse> for Oper<PasswordReset> { } impl Perform<LoginResponse> for Oper<PasswordChange> { - fn perform(&self) -> Result<LoginResponse, Error> { + fn perform(&self, conn: &PgConnection) -> Result<LoginResponse, Error> { let data: &PasswordChange = &self.data; - let conn = establish_connection(); // Fetch the user_id from the token let user_id = PasswordResetRequest::read_from_token(&conn, &data.token)?.user_id; |