dietrich/Pslink
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases 1 Activity

Bumping versions using actix-web 4

Browse Source
This commit is contained in:
Dietrich 2021-10-11 13:01:19 +02:00
parent 1b014841ab
commit 4c405b8a3c
Signed by: dietrich
GPG Key ID: 9F3C20C0F85DF67C
9 changed files with 620 additions and 604 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1082
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

8
app/Cargo.toml
View File

@ -8,7 +8,7 @@ keywords = ["url", "link", "webpage", "actix", "web"]
license = "MIT OR Apache-2.0"
readme = "README.md"
repository = "https://github.com/enaut/pslink/"
version = "0.4.3"
version = "0.4.4"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@ -16,12 +16,12 @@ version = "0.4.3"
crate-type = ["cdylib", "rlib"]
[dependencies]
fluent = "0.15"
fluent = "0.16"
seed = "0.8"
serde = {version="1.0", features = ["derive"]}
unic-langid = "0.9"
strum_macros = "0.21"
strum = "0.21"
strum_macros = "0.22"
strum = "0.22"
enum-map = "1"
qrcode = "0.12"
image = "0.23"

4
locales/Cargo.toml
View File

@ -8,13 +8,13 @@ keywords = ["url", "link", "webpage", "actix", "web"]
license = "MIT OR Apache-2.0"
readme = "README.md"
repository = "https://github.com/enaut/pslink/"
version = "0.4.3"
version = "0.4.4"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
fluent = "0.15"
fluent = "0.16"
serde = {version="1.0", features = ["derive"]}
unic-langid = "0.9"

33
pslink/Cargo.toml
View File

@ -9,33 +9,36 @@ license = "MIT OR Apache-2.0"
name = "pslink"
readme = "README.md"
repository = "https://github.com/enaut/pslink/"
version = "0.4.3"
version = "0.4.4"
[build-dependencies]
actix-web-static-files = "3.0"
actix-web-static-files = { path = "../../actix-web-static-files" }
static-files = { version = "0.2", default-features = false }
[dependencies]
actix-identity = "0.3"
actix-rt = "1.1"
actix-web = "3"
actix-web-static-files = "3"
actix-files = "0.5"
actix-identity = "0.4.0-beta.2"
actix-rt = "2.2"
actix-web = "4.0.0-beta.9"
actix-web-static-files = { path = "../../actix-web-static-files" }
actix-files = "0.6.0-beta.7"
argonautica = "0.2"
clap = "2.33"
dotenv = "0.15.0"
fluent-langneg = "0.13"
image = "0.23"
opentelemetry = "0.14"
opentelemetry-jaeger = "0.12"
opentelemetry = "0.16"
opentelemetry-jaeger = "0.15"
qrcode = "0.12"
rand = "0.8"
rpassword = "5.0"
serde = {version="1.0", features = ["derive"]}
static-files = { version = "0.2", default-features = false }
thiserror = "1.0"
tracing-actix-web = "0.2.1"
tracing-opentelemetry = "0.12"
tracing-actix-web = "0.4.0-beta.13"
tracing-opentelemetry = "0.15"
async-trait = "0.1"
enum-map = {version="1", features = ["serde"]}
indexmap = "~1.6.2"
pslink-shared = {version="0.4", path = "../shared" }
@ -48,7 +51,7 @@ version = "0.6"
[dependencies.sqlx]
features = ["sqlite", "macros", "runtime-actix-rustls", "chrono", "migrate", "offline"]
version = "0.4"
version = "0.5"
[dependencies.tracing]
features = ["log"]
@ -62,11 +65,11 @@ version = "0.2.17"
actix-server = "1.0.4"
tempdir = "0.3"
test_bin = "0.3"
tokio = "0.2.25"
assert_cmd = "1.0.7"
tokio = "1.12"
assert_cmd = "2.0"
predicates = "2.0.0"
[dev-dependencies.reqwest]
features = ["cookies", "json"]
version = "0.10.10"
version = "0.11"

2
pslink/build.rs
View File

@ -1,4 +1,4 @@
use actix_web_static_files::resource_dir;
use static_files::resource_dir;
fn main() {
resource_dir("./static/").build().unwrap();

9
pslink/src/bin/pslink/main.rs
View File

@ -5,6 +5,8 @@ mod views;
use actix_files::Files;
use actix_identity::{CookieIdentityPolicy, IdentityService};
use actix_web::middleware::Compat;
use actix_web::web::Data;
use actix_web::{web, App, HttpServer};
use pslink::ServerConfig;
@ -32,7 +34,7 @@ pub fn get_subscriber(name: &str, env_filter: &str) -> impl Subscriber + Send +
let otel_layer = OpenTelemetryLayer::new(tracer);
// Use the tracing subscriber `Registry`, or any other subscriber
// that impls `LookupSpan`
// that implements `LookupSpan`
Registry::default()
.with(otel_layer)
.with(env_filter)
@ -105,9 +107,10 @@ pub async fn webservice(
let server = HttpServer::new(move || {
let generated = generate();
let logger = Compat::new(TracingLogger::default());
App::new()
.data(server_config.clone())
.wrap(TracingLogger)
.app_data(Data::new(server_config.clone()))
.wrap(logger)
.wrap(IdentityService::new(
CookieIdentityPolicy::new(&[0; 32])
.name("auth-cookie")

52
pslink/src/bin/pslink/views.rs
View File

@ -30,13 +30,13 @@ use pslink::ServerError;
#[instrument]
fn redirect_builder(target: &str) -> HttpResponse {
HttpResponse::SeeOther()
.set(CacheControl(vec![
.insert_header(CacheControl(vec![
CacheDirective::NoCache,
CacheDirective::NoStore,
CacheDirective::MustRevalidate,
]))
.set(Expires(SystemTime::now().into()))
.set_header(actix_web::http::header::LOCATION, target)
.insert_header(Expires(SystemTime::now().into()))
.insert_header((actix_web::http::header::LOCATION, target))
.body(format!("Redirect to {}", target))
}
@ -112,7 +112,7 @@ pub async fn index_json(
) -> Result<HttpResponse, ServerError> {
info!("Listing Links to Json api");
match queries::list_all_allowed(&id, &config, form.0).await {
Ok(links) => Ok(HttpResponse::Ok().json2(&links.list)),
Ok(links) => Ok(HttpResponse::Ok().json(&links.list)),
Err(e) => {
error!("Failed to access database: {:?}", e);
warn!("Not logged in - redirecting to login page");
@ -129,7 +129,7 @@ pub async fn index_users_json(
) -> Result<HttpResponse, ServerError> {
info!("Listing Users to Json api");
if let Ok(users) = queries::list_users(&id, &config, form.0).await {
Ok(HttpResponse::Ok().json2(&users.list))
Ok(HttpResponse::Ok().json(&users.list))
} else {
Ok(redirect_builder("/admin/login"))
}
@ -145,7 +145,7 @@ pub async fn get_logged_user_json(
Ok(HttpResponse::Unauthorized().finish())
}
RoleGuard::Regular { user } | RoleGuard::Admin { user } => {
Ok(HttpResponse::Ok().json2(&user))
Ok(HttpResponse::Ok().json(&user))
}
}
}
@ -156,7 +156,7 @@ pub async fn download_png(
config: web::Data<crate::ServerConfig>,
link_code: web::Path<String>,
) -> Result<HttpResponse, ServerError> {
match queries::get_link(&id, &link_code.0, &config).await {
match queries::get_link(&id, &link_code, &config).await {
Ok(query) => {
let qr = QrCode::with_error_correction_level(
&format!("http://{}/{}", config.public_url, &query.item.code),
@ -169,7 +169,9 @@ pub async fn download_png(
.write_to(&mut temporary_data, ImageOutputFormat::Png)
.unwrap();
let image_data = temporary_data.into_inner();
Ok(HttpResponse::Ok().set(ContentType::png()).body(image_data))
Ok(HttpResponse::Ok()
.insert_header(ContentType::png())
.body(image_data))
}
Err(e) => Err(e),
}
@ -183,7 +185,7 @@ pub async fn process_create_user_json(
) -> Result<HttpResponse, ServerError> {
info!("Listing Users to Json api");
match queries::create_user(&id, data.into_inner(), &config).await {
Ok(item) => Ok(HttpResponse::Ok().json2(&Status::Success(Message {
Ok(item) => Ok(HttpResponse::Ok().json(&Status::Success(Message {
message: format!("Successfully saved user: {}", item.item.username),
}))),
Err(e) => Err(e),
@ -198,7 +200,7 @@ pub async fn process_update_user_json(
) -> Result<HttpResponse, ServerError> {
info!("Listing Users to Json api");
match queries::update_user(&id, &form, &config).await {
Ok(item) => Ok(HttpResponse::Ok().json2(&Status::Success(Message {
Ok(item) => Ok(HttpResponse::Ok().json(&Status::Success(Message {
message: format!("Successfully saved user: {}", item.item.username),
}))),
Err(e) => Err(e),
@ -212,7 +214,7 @@ pub async fn toggle_admin(
id: Identity,
) -> Result<HttpResponse, ServerError> {
let update = queries::toggle_admin(&id, user.id, &config).await?;
Ok(HttpResponse::Ok().json2(&Status::Success(Message {
Ok(HttpResponse::Ok().json(&Status::Success(Message {
message: format!(
"Successfully changed privileges or user: {}",
update.item.username
@ -230,14 +232,14 @@ pub async fn get_language(
let user = authenticate(&id, &config).await?;
match user {
RoleGuard::NotAuthenticated | RoleGuard::Disabled => {
Ok(HttpResponse::Ok().json2(&detect_language(&req)?))
Ok(HttpResponse::Ok().json(&detect_language(&req)?))
}
RoleGuard::Regular { user } | RoleGuard::Admin { user } => {
Ok(HttpResponse::Ok().json2(&user.language))
Ok(HttpResponse::Ok().json(&user.language))
}
}
} else {
Ok(HttpResponse::Ok().json2(&detect_language(&req)?))
Ok(HttpResponse::Ok().json(&detect_language(&req)?))
}
}
@ -248,7 +250,7 @@ pub async fn set_language(
id: Identity,
) -> Result<HttpResponse, ServerError> {
queries::set_language(&id, data.0, &config).await?;
Ok(HttpResponse::Ok().json2(&data.0))
Ok(HttpResponse::Ok().json(&data.0))
}
#[instrument(skip(id))]
@ -278,23 +280,23 @@ pub async fn process_login_json(
info!("Log-in of user: {}", &u.username);
let session_token = u.username.clone();
id.remember(session_token);
Ok(HttpResponse::Ok().json2(&u))
Ok(HttpResponse::Ok().json(&u))
} else {
info!("Invalid password for user: {}", &u.username);
Ok(HttpResponse::Unauthorized().json2(&Status::Error(Message {
Ok(HttpResponse::Unauthorized().json(&Status::Error(Message {
message: "Failed to Login".to_string(),
})))
}
} else {
// should fail earlier if secret is missing.
Ok(HttpResponse::Unauthorized().json2(&Status::Error(Message {
Ok(HttpResponse::Unauthorized().json(&Status::Error(Message {
message: "Failed to Login".to_string(),
})))
}
}
Err(e) => {
info!("Failed to login: {}", e);
Ok(HttpResponse::Unauthorized().json2(&Status::Error(Message {
Ok(HttpResponse::Unauthorized().json(&Status::Error(Message {
message: "Failed to Login".to_string(),
})))
}
@ -311,7 +313,7 @@ pub async fn logout(id: Identity) -> Result<HttpResponse, ServerError> {
#[instrument()]
pub async fn to_admin() -> Result<HttpResponse, ServerError> {
let response = HttpResponse::PermanentRedirect()
.set_header(actix_web::http::header::LOCATION, "/app/")
.insert_header((actix_web::http::header::LOCATION, "/app/"))
.body(r#"The admin interface moved to <a href="/app/">/app/</a>"#);
Ok(response)
@ -324,7 +326,7 @@ pub async fn redirect(
req: HttpRequest,
) -> Result<HttpResponse, ServerError> {
info!("Redirecting to {:?}", data);
let link = queries::get_link_simple(&data.0, &config).await;
let link = queries::get_link_simple(&data, &config).await;
info!("link: {:?}", link);
match link {
Ok(link) => {
@ -334,7 +336,7 @@ pub async fn redirect(
Err(ServerError::Database(e)) => {
info!(
"Link was not found: http://{}/{} \n {}",
&config.public_url, &data.0, e
&config.public_url, &data, e
);
Ok(HttpResponse::NotFound().body(
r#"<!DOCTYPE html>
@ -373,7 +375,7 @@ pub async fn process_create_link_json(
) -> Result<HttpResponse, ServerError> {
let new_link = queries::create_link(&id, data.into_inner(), &config).await;
match new_link {
Ok(item) => Ok(HttpResponse::Ok().json2(&Status::Success(Message {
Ok(item) => Ok(HttpResponse::Ok().json(&Status::Success(Message {
message: format!("Successfully saved link: {}", item.item.code),
}))),
Err(e) => Err(e),
@ -388,7 +390,7 @@ pub async fn process_update_link_json(
) -> Result<HttpResponse, ServerError> {
let new_link = queries::update_link(&id, data.into_inner(), &config).await;
match new_link {
Ok(item) => Ok(HttpResponse::Ok().json2(&Status::Success(Message {
Ok(item) => Ok(HttpResponse::Ok().json(&Status::Success(Message {
message: format!("Successfully updated link: {}", item.item.code),
}))),
Err(e) => Err(e),
@ -402,7 +404,7 @@ pub async fn process_delete_link_json(
data: web::Json<LinkDelta>,
) -> Result<HttpResponse, ServerError> {
queries::delete_link(&id, &data.code, &config).await?;
Ok(HttpResponse::Ok().json2(&Status::Success(Message {
Ok(HttpResponse::Ok().json(&Status::Success(Message {
message: format!("Successfully deleted link: {}", &data.code),
})))
}

6
shared/Cargo.toml
View File

@ -8,11 +8,11 @@ license = "MIT OR Apache-2.0"
name = "pslink-shared"
readme = "../pslink/README.md"
repository = "https://github.com/enaut/pslink/"
version = "0.4.3"
version = "0.4.4"
[dependencies]
serde = {version="1.0", features = ["derive"]}
chrono = {version = "0.4", features = ["serde"] }
enum-map = {version="1", features = ["serde"]}
strum_macros = "0.21"
strum = "0.21"
strum_macros = "0.22"
strum = "0.22"

28
shared/src/datatypes.rs
View File

@ -1,11 +1,11 @@
//! The more generic datatypes used in pslink
//! The more generic data-types used in pslink
use std::ops::Deref;
use serde::{Deserialize, Serialize, Serializer};
use strum_macros::{AsRefStr, EnumIter, EnumString, ToString};
use strum_macros::{AsRefStr, EnumIter, EnumString};
use crate::apirequests::users::Role;
/// A generic list returntype containing the User and a Vec containing e.g. Links or Users
/// A generic list return type containing the User and a Vec containing e.g. Links or Users
#[derive(Clone, Deserialize, Serialize)]
pub struct ListWithOwner<T> {
pub user: User,
@ -48,7 +48,7 @@ pub struct Count {
pub number: i32,
}
/// Everytime a shor url is clicked record it for statistical evaluation.
/// Every time a short url is clicked record it for statistical evaluation.
#[derive(Serialize, Debug)]
pub struct Click {
pub id: i64,
@ -118,20 +118,10 @@ impl<T> Deref for Loadable<T> {
}
/// An `enum` containing the available languages.
/// To add an additional language add it to this enum aswell as an appropriate file into the locales folder.
/// To add an additional language add it to this enum as well as an appropriate file into the locales folder.
#[allow(clippy::upper_case_acronyms)]
#[derive(
Debug,
Copy,
Clone,
EnumIter,
EnumString,
ToString,
AsRefStr,
Eq,
PartialEq,
Serialize,
Deserialize,
Debug, Copy, Clone, EnumIter, EnumString, AsRefStr, Eq, PartialEq, Serialize, Deserialize,
)]
pub enum Lang {
#[strum(serialize = "en-US", serialize = "en", serialize = "enUS")]
@ -139,3 +129,9 @@ pub enum Lang {
#[strum(serialize = "de-DE", serialize = "de", serialize = "deDE")]
DeDE,
}
impl std::fmt::Display for Lang {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
write!(f, "{:?}", self)
}
}