Skip to content

GitLab

Commit 6c948ff7 authored by Robert Czechowski's avatar Robert Czechowski
Browse files

Start making sqlite and postgres implementations more similar

parent 419bca75
Hide whitespace changes
Inline Side-by-side
src/db_conn.rs
View file @ 6c948ff7
use db_objects::*; use db_objects::*;
use functions; use functions;
use std::path::Path;
pub trait MedalConnection { pub trait MedalConnection {
fn create(file: &Path) -> Self;
fn dbtype(&self) -> &'static str; fn dbtype(&self) -> &'static str;
fn migration_already_applied(&self, name: &str) -> bool; fn migration_already_applied(&self, name: &str) -> bool;
......
src/db_conn_postgres.rs
View file @ 6c948ff7
extern crate bcrypt; extern crate bcrypt;
extern crate postgres; extern crate postgres;
use self::postgres::{Connection, TlsMode}; use self::postgres::Connection;
use db_conn::{MedalConnection, MedalObject}; use db_conn::{MedalConnection, MedalObject};
use db_objects::*; use db_objects::*;
...@@ -11,8 +11,6 @@ use rand::{distributions::Alphanumeric, thread_rng, Rng}; ...@@ -11,8 +11,6 @@ use rand::{distributions::Alphanumeric, thread_rng, Rng};
use self::time::Duration; use self::time::Duration;
use time; use time;
use std::path::Path;
use self::bcrypt::verify; use self::bcrypt::verify;
use functions; // todo: remove (usertype in db) use functions; // todo: remove (usertype in db)
...@@ -25,9 +23,25 @@ fn verify_password(password: &str, salt: &str, password_hash: &str) -> bool { ...@@ -25,9 +23,25 @@ fn verify_password(password: &str, salt: &str, password_hash: &str) -> bool {
} }
} }
impl MedalConnection for Connection { trait Queryable {
fn create(file: &Path) -> Connection { Connection::connect(file.to_str().unwrap(), TlsMode::None).unwrap() } fn query_map_one<T, F>(&self, sql: &str, params: &[&postgres::types::ToSql], f: F) -> postgres::Result<Option<T>>
where F: FnOnce(postgres::rows::Row<'_>) -> T;
}
impl Queryable for Connection {
fn query_map_one<T, F>(&self, sql: &str, params: &[&postgres::types::ToSql], f: F) -> postgres::Result<Option<T>>
where F: FnOnce(postgres::rows::Row<'_>) -> T {
let rows = self.query(sql, params)?;
// empty lines to match sqlite
//
//
//
Ok(rows.iter().next().map(f))
}
}
impl MedalConnection for Connection {
fn dbtype(&self) -> &'static str { "postgres" } fn dbtype(&self) -> &'static str { "postgres" }
fn migration_already_applied(&self, name: &str) -> bool { fn migration_already_applied(&self, name: &str) -> bool {
...@@ -53,36 +67,36 @@ impl MedalConnection for Connection { ...@@ -53,36 +67,36 @@ impl MedalConnection for Connection {
// fn get_session<T: ToSql>(&self, key: T, keyname: &str) -> Option<SessionUser> { // fn get_session<T: ToSql>(&self, key: T, keyname: &str) -> Option<SessionUser> {
fn get_session(&self, key: &str) -> Option<SessionUser> { fn get_session(&self, key: &str) -> Option<SessionUser> {
let session = self.query("SELECT id, csrf_token, last_login, last_activity, permanent_login, username, password, logincode, email, email_unconfirmed, email_confirmationcode, firstname, lastname, street, zip, city, nation, grade, is_teacher, managed_by, oauth_provider, oauth_foreign_id, salt FROM session WHERE session_token = $1", &[&key]).ok()?.iter().next().map(|row| { let query = "SELECT id, csrf_token, last_login, last_activity, permanent_login, username, password, logincode, email, email_unconfirmed, email_confirmationcode, firstname, lastname, street, zip, city, nation, grade, is_teacher, managed_by, oauth_provider, oauth_foreign_id, salt FROM session WHERE session_token = $1";
SessionUser { id: row.get(0), let session = self.query_map_one(query, &[&key], |row| SessionUser { id: row.get(0),
session_token: Some(key.to_string()), session_token: Some(key.to_string()),
csrf_token: row.get(1), csrf_token: row.get(1),
last_login: row.get(2), last_login: row.get(2),
last_activity: row.get(3), last_activity: row.get(3),
permanent_login: row.get(4), permanent_login: row.get(4),
username: row.get(5), username: row.get(5),
password: row.get(6), password: row.get(6),
salt: row.get(22), salt: row.get(22),
logincode: row.get(7), logincode: row.get(7),
email: row.get(8), email: row.get(8),
email_unconfirmed: row.get(9), email_unconfirmed: row.get(9),
email_confirmationcode: row.get(10), email_confirmationcode: row.get(10),
firstname: row.get(11), firstname: row.get(11),
lastname: row.get(12), lastname: row.get(12),
street: row.get(13), street: row.get(13),
zip: row.get(14), zip: row.get(14),
city: row.get(15), city: row.get(15),
nation: row.get(16), nation: row.get(16),
grade: row.get(17), grade: row.get(17),
is_teacher: row.get(18), is_teacher: row.get(18),
managed_by: row.get(19), managed_by: row.get(19),
oauth_provider: row.get(20), oauth_provider: row.get(20),
oauth_foreign_id: row.get(21) } oauth_foreign_id: row.get(21) })
})?; .ok()??;
let duration = if session.permanent_login { Duration::days(90) } else { Duration::minutes(90) }; let duration = if session.permanent_login { Duration::days(90) } else { Duration::minutes(90) };
let now = time::get_time(); let now = time::get_time();
......
src/db_conn_sqlite.rs
View file @ 6c948ff7
...@@ -11,8 +11,6 @@ use rand::{distributions::Alphanumeric, thread_rng, Rng}; ...@@ -11,8 +11,6 @@ use rand::{distributions::Alphanumeric, thread_rng, Rng};
use self::time::Duration; use self::time::Duration;
use time; use time;
use std::path::Path;
use self::bcrypt::verify; use self::bcrypt::verify;
use functions; // todo: remove (usertype in db) use functions; // todo: remove (usertype in db)
...@@ -25,9 +23,25 @@ fn verify_password(password: &str, salt: &str, password_hash: &str) -> bool { ...@@ -25,9 +23,25 @@ fn verify_password(password: &str, salt: &str, password_hash: &str) -> bool {
} }
} }
impl MedalConnection for Connection { trait Queryable {
fn create(file: &Path) -> Connection { Connection::open(file).unwrap() } fn query_map_one<T, F>(&self, sql: &str, params: &[&rusqlite::types::ToSql], f: F) -> rusqlite::Result<Option<T>>
where F: FnOnce(&rusqlite::Row) -> T;
}
impl Queryable for Connection {
fn query_map_one<T, F>(&self, sql: &str, params: &[&rusqlite::types::ToSql], f: F) -> rusqlite::Result<Option<T>>
where F: FnOnce(&rusqlite::Row) -> T {
let mut stmt = self.prepare(sql)?;
let mut rows = stmt.query(params)?;
match rows.next() {
None => Ok(None),
Some(Err(e)) => Err(e),
Some(Ok(row)) => Ok(Some(f(&row))),
}
}
}
impl MedalConnection for Connection {
fn dbtype(&self) -> &'static str { "sqlite" } fn dbtype(&self) -> &'static str { "sqlite" }
fn migration_already_applied(&self, name: &str) -> bool { fn migration_already_applied(&self, name: &str) -> bool {
...@@ -53,59 +67,52 @@ impl MedalConnection for Connection { ...@@ -53,59 +67,52 @@ impl MedalConnection for Connection {
// fn get_session<T: ToSql>(&self, key: T, keyname: &str) -> Option<SessionUser> { // fn get_session<T: ToSql>(&self, key: T, keyname: &str) -> Option<SessionUser> {
fn get_session(&self, key: &str) -> Option<SessionUser> { fn get_session(&self, key: &str) -> Option<SessionUser> {
let res = self.query_row("SELECT id, csrf_token, last_login, last_activity, permanent_login, username, password, logincode, email, email_unconfirmed, email_confirmationcode, firstname, lastname, street, zip, city, nation, grade, is_teacher, managed_by, oauth_provider, oauth_foreign_id, salt FROM session_user WHERE session_token = ?1", &[&key], |row| { let query = "SELECT id, csrf_token, last_login, last_activity, permanent_login, username, password, logincode, email, email_unconfirmed, email_confirmationcode, firstname, lastname, street, zip, city, nation, grade, is_teacher, managed_by, oauth_provider, oauth_foreign_id, salt FROM session_user WHERE session_token = ?1";
SessionUser { let session = self.query_map_one(query, &[&key], |row| SessionUser { id: row.get(0),
id: row.get(0), session_token: Some(key.to_string()),
session_token: Some(key.to_string()), csrf_token: row.get(1),
csrf_token: row.get(1), last_login: row.get(2),
last_login: row.get(2), last_activity: row.get(3),
last_activity: row.get(3), permanent_login: row.get(4),
permanent_login: row.get(4),
username: row.get(5),
username: row.get(5), password: row.get(6),
password: row.get(6), salt: row.get(22),
salt: row.get(22), logincode: row.get(7),
logincode: row.get(7), email: row.get(8),
email: row.get(8), email_unconfirmed: row.get(9),
email_unconfirmed: row.get(9), email_confirmationcode: row.get(10),
email_confirmationcode: row.get(10),
firstname: row.get(11),
firstname: row.get(11), lastname: row.get(12),
lastname: row.get(12), street: row.get(13),
street: row.get(13), zip: row.get(14),
zip: row.get(14), city: row.get(15),
city: row.get(15), nation: row.get(16),
nation: row.get(16), grade: row.get(17),
grade: row.get(17),
is_teacher: row.get(18),
is_teacher: row.get(18), managed_by: row.get(19),
managed_by: row.get(19),
oauth_provider: row.get(20),
oauth_provider: row.get(20), oauth_foreign_id: row.get(21) })
oauth_foreign_id: row.get(21), .ok()??;
}
}); let duration = if session.permanent_login { Duration::days(90) } else { Duration::minutes(90) };
match res { let now = time::get_time();
Ok(session) => { if let Some(last_activity) = session.last_activity {
let duration = if session.permanent_login { Duration::days(90) } else { Duration::minutes(90) }; if now - last_activity < duration {
let now = time::get_time(); self.execute("UPDATE session_user SET last_activity = ?1 WHERE id = ?2", &[&now, &session.id]).unwrap();
if let Some(last_activity) = session.last_activity { Some(session)
if now - last_activity < duration { } else {
self.execute("UPDATE session_user SET last_activity = ?1 WHERE id = ?2", &[&now, &session.id]) // Session timed out
.unwrap(); // Should remove session token from session_user
Some(session) None
} else {
// Session timed out
// Should remove session token from session_user
None
}
} else {
// last_activity undefined
// TODO: What should happen here?
None
}
} }
_ => None, // no session found, should create new session in get_session_or_new() } else {
// last_activity undefined
// TODO: What should happen here?
None
} }
} }
fn save_session(&self, session: SessionUser) { fn save_session(&self, session: SessionUser) {
......
src/main.rs
View file @ 6c948ff7
...@@ -259,10 +259,10 @@ fn prepare_and_start_server<C>(mut conn: C, config: Config, onlycontestscan: boo ...@@ -259,10 +259,10 @@ fn prepare_and_start_server<C>(mut conn: C, config: Config, onlycontestscan: boo
if let (Some(self_url), Some(true)) = (self_url, open_browser) { if let (Some(self_url), Some(true)) = (self_url, open_browser) {
open_browser_window(&self_url); open_browser_window(&self_url);
} }
}, }
Err(_) => println!("Error on server start …"), Err(_) => println!("Error on server start …"),
}; };
println!("Could not run server. Is the port already in use?"); println!("Could not run server. Is the port already in use?");
} }
} }
...@@ -270,7 +270,7 @@ fn prepare_and_start_server<C>(mut conn: C, config: Config, onlycontestscan: boo ...@@ -270,7 +270,7 @@ fn prepare_and_start_server<C>(mut conn: C, config: Config, onlycontestscan: boo
fn open_browser_window(self_url: &str) { fn open_browser_window(self_url: &str) {
match webbrowser::open(&self_url) { match webbrowser::open(&self_url) {
Ok(_) => (), Ok(_) => (),
Err(e) => println!("Error while opening webbrowser: {:?}", e) Err(e) => println!("Error while opening webbrowser: {:?}", e),
} }
} }
...@@ -299,7 +299,7 @@ fn main() { ...@@ -299,7 +299,7 @@ fn main() {
if config.database_url.is_some() { if config.database_url.is_some() {
let conn = let conn =
postgres::Connection::connect(config.database_url.clone().unwrap(), postgres::TlsMode::None).unwrap(); postgres::Connection::connect(config.database_url.clone().unwrap(), postgres::TlsMode::None).unwrap();
prepare_and_start_server(conn, config, opt.onlycontestscan, opt.resetadminpw); prepare_and_start_server(conn, config, opt.onlycontestscan, opt.resetadminpw);
} else { } else {
let conn = match config.database_file { let conn = match config.database_file {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment