saltyming/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2025-08-21 18:25:24 +00:00
Code Activity

Migrate to rust 2018 edition

Browse source
This commit is contained in:
Daniel García 2018-12-07 02:05:45 +01:00
commit 94810c106a
No known key found for this signature in database
GPG key ID: FC8A7D14C3CD543A
25 changed files with 105 additions and 136 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/db/mod.rs
View file

@ -9,7 +9,7 @@ use rocket::http::Status;
use rocket::request::{self, FromRequest};
use rocket::{Outcome, Request, State};
use CONFIG;
use crate::CONFIG;
/// An alias to the database connection used
type Connection = SqliteConnection;

10
src/db/models/attachment.rs
View file

@ -1,7 +1,7 @@
use serde_json::Value;
use super::Cipher;
use CONFIG;
use crate::CONFIG;
#[derive(Debug, Identifiable, Queryable, Insertable, Associations)]
#[table_name = "attachments"]
@ -32,7 +32,7 @@ impl Attachment {
}
pub fn to_json(&self, host: &str) -> Value {
use util::get_display_size;
use crate::util::get_display_size;
let web_path = format!("{}/attachments/{}/{}", host, self.cipher_uuid, self.id);
let display_size = get_display_size(self.file_size);
@ -51,8 +51,8 @@ impl Attachment {
use diesel;
use diesel::prelude::*;
use db::DbConn;
use db::schema::attachments;
use crate::db::DbConn;
use crate::db::schema::attachments;
/// Database methods
impl Attachment {
@ -64,7 +64,7 @@ impl Attachment {
}
pub fn delete(self, conn: &DbConn) -> QueryResult<()> {
use util;
use crate::util;
use std::{thread, time};
let mut retries = 10;

6
src/db/models/cipher.rs
View file

@ -63,14 +63,14 @@ impl Cipher {
use diesel;
use diesel::prelude::*;
use db::DbConn;
use db::schema::*;
use crate::db::DbConn;
use crate::db::schema::*;
/// Database methods
impl Cipher {
pub fn to_json(&self, host: &str, user_uuid: &str, conn: &DbConn) -> Value {
use serde_json;
use util::format_date;
use crate::util::format_date;
use super::Attachment;
let attachments = Attachment::find_by_cipher(&self.uuid, conn);

4
src/db/models/collection.rs
View file

@ -37,8 +37,8 @@ impl Collection {
use diesel;
use diesel::prelude::*;
use db::DbConn;
use db::schema::*;
use crate::db::DbConn;
use crate::db::schema::*;
/// Database methods
impl Collection {

10
src/db/models/device.rs
View file

@ -45,7 +45,7 @@ impl Device {
pub fn refresh_twofactor_remember(&mut self) -> String {
use data_encoding::BASE64;
use crypto;
use crate::crypto;
let twofactor_remember = BASE64.encode(&crypto::get_random(vec![0u8; 180]));
self.twofactor_remember = Some(twofactor_remember.clone());
@ -62,7 +62,7 @@ impl Device {
// If there is no refresh token, we create one
if self.refresh_token.is_empty() {
use data_encoding::BASE64URL;
use crypto;
use crate::crypto;
self.refresh_token = BASE64URL.encode(&crypto::get_random_64());
}
@ -77,7 +77,7 @@ impl Device {
// Create the JWT claims struct, to send to the client
use auth::{encode_jwt, JWTClaims, DEFAULT_VALIDITY, JWT_ISSUER};
use crate::auth::{encode_jwt, JWTClaims, DEFAULT_VALIDITY, JWT_ISSUER};
let claims = JWTClaims {
nbf: time_now.timestamp(),
exp: (time_now + *DEFAULT_VALIDITY).timestamp(),
@ -106,8 +106,8 @@ impl Device {
use diesel;
use diesel::prelude::*;
use db::DbConn;
use db::schema::devices;
use crate::db::DbConn;
use crate::db::schema::devices;
/// Database methods
impl Device {

6
src/db/models/folder.rs
View file

@ -43,7 +43,7 @@ impl Folder {
}
pub fn to_json(&self) -> Value {
use util::format_date;
use crate::util::format_date;
json!({
"Id": self.uuid,
@ -65,8 +65,8 @@ impl FolderCipher {
use diesel;
use diesel::prelude::*;
use db::DbConn;
use db::schema::{folders, folders_ciphers};
use crate::db::DbConn;
use crate::db::schema::{folders, folders_ciphers};
/// Database methods
impl Folder {

4
src/db/models/organization.rs
View file

@ -236,8 +236,8 @@ impl UserOrganization {
use diesel;
use diesel::prelude::*;
use db::DbConn;
use db::schema::{organizations, users_organizations, users_collections, ciphers_collections};
use crate::db::DbConn;
use crate::db::schema::{organizations, users_organizations, users_collections, ciphers_collections};
/// Database methods
impl Organization {

4
src/db/models/two_factor.rs
View file

@ -78,8 +78,8 @@ impl TwoFactor {
use diesel;
use diesel::prelude::*;
use db::DbConn;
use db::schema::twofactor;
use crate::db::DbConn;
use crate::db::schema::twofactor;
/// Database methods
impl TwoFactor {

8
src/db/models/user.rs
View file

@ -3,8 +3,8 @@ use serde_json::Value;
use uuid::Uuid;
use crypto;
use CONFIG;
use crate::crypto;
use crate::CONFIG;
#[derive(Debug, Identifiable, Queryable, Insertable)]
@ -113,8 +113,8 @@ impl User {
use diesel;
use diesel::prelude::*;
use db::DbConn;
use db::schema::{users, invitations};
use crate::db::DbConn;
use crate::db::schema::{users, invitations};
use super::{Cipher, Folder, Device, UserOrganization, UserOrgType};
/// Database methods