Merge pull request #5 from fiji-flo/cache

cache username lookups

Author: fiji-flo

.travis.yml

@@ -0,0 +1,19 @@
+language: rust
+rust:
+  - stable
+  - nightly
+cache: cargo
+matrix:
+  allow_failures:
+    - rust: nightly
+  fast_finish: true
+
+before_script:
+  - rustup component add rustfmt-preview
+  - rustup component add clippy-preview
+
+script:
+  - cargo fmt --all -- --check
+  - cargo clippy -- -D warnings
+  - cargo build --all
+  - cargo test --all

Cargo.lock

@@ -15,8 +15,9 @@ oauth2 = "2.0.0-beta.2"
 url = "1.7.2"
 base64 = "0.10.1"
 rand = "0.6.5"
-actix-web = { version = "1.0.0", features = ["ssl"] }
-actix-session = "0.1.0"
+actix-web = { version = "1.0", features = ["ssl"] }
+actix-cors = "0.1"
+actix-session = "0.1"
 failure = "0.1.5"
 config = "0.9.3"
 serde = "1.0.80"
@@ -26,3 +27,4 @@ futures = "0.1"
 chrono = "0.4.6"
 env_logger = "0.6.1"
 log = "0.4.6"
+ttl_cache = "0.5.1"

Cargo.toml

@@ -2,13 +2,13 @@ use crate::settings::BugZilla;
 use crate::settings::WhoAmI;
 use crate::update::update_bugzilla;
 use crate::userid::UserId;
+use actix_cors::Cors;
 use actix_session::CookieSession;
 use actix_session::Session;
 use actix_web::client::Client;
 use actix_web::cookie::SameSite;
 use actix_web::dev::HttpServiceFactory;
 use actix_web::http;
-use actix_web::middleware::cors::Cors;
 use actix_web::web;
 use actix_web::Error;
 use actix_web::HttpResponse;

src/bugzilla/app.rs

@@ -2,23 +2,24 @@ use crate::settings::GitHub;
 use crate::settings::WhoAmI;
 use crate::update::update_github;
 use crate::userid::UserId;
+use actix_cors::Cors;
 use actix_session::CookieSession;
 use actix_session::Session;
 use actix_web::client::Client;
 use actix_web::cookie::SameSite;
 use actix_web::dev::HttpServiceFactory;
 use actix_web::http;
-use actix_web::middleware::cors::Cors;
 use actix_web::web;
 use actix_web::Error;
 use actix_web::HttpResponse;
 use actix_web::Responder;
 use cis_client::getby::GetBy;
 use cis_client::AsyncCisClientTrait;
 use cis_profile::schema::Profile;
-use future::IntoFuture;
 use futures::future;
+use futures::future::Either;
 use futures::Future;
+use futures::IntoFuture;
 use oauth2::basic::BasicClient;
 use oauth2::prelude::*;
 use oauth2::AuthUrl;
@@ -31,12 +32,17 @@ use oauth2::Scope;
 use oauth2::TokenResponse;
 use oauth2::TokenUrl;
 use std::sync::Arc;
+use std::sync::RwLock;
+use std::time::Duration;
+use ttl_cache::TtlCache;
 use url::Url;
 
 const AUTH_URL: &str = "https://github.com/login/oauth/authorize";
 const TOKEN_URL: &str = "https://github.com/login/oauth/access_token";
 const USER_URL: &str = "https://api.github.com/user";
 
+const CACHE_DURATION: Duration = Duration::from_secs(24 * 60 * 60);
+
 #[derive(Deserialize)]
 pub struct Auth {
     code: String,
@@ -56,21 +62,40 @@ pub struct GitHubUser {
     node_id: String,
 }
 
-fn id_to_username(id: web::Path<String>) -> impl Future<Item = HttpResponse, Error = Error> {
-    Client::default()
-        .get(format!("{}/{}", USER_URL, id))
-        .header(http::header::USER_AGENT, "whoami")
-        .send()
-        .map_err(Into::into)
-        .and_then(|mut res| {
-            info!("status: {}", res.status());
-            res.json::<GitHubUser>().map_err(Into::into)
-        })
-        .and_then(|user| {
-            HttpResponse::Ok().json(GitHubUsername {
-                username: user.login,
-            })
-        })
+fn id_to_username(
+    id: web::Path<String>,
+    cache: web::Data<Arc<RwLock<TtlCache<String, String>>>>,
+) -> impl Future<Item = HttpResponse, Error = Error> {
+    if let Some(username) = cache.read().ok().and_then(|c| c.get(&*id).cloned()) {
+        info!("serving {} → {} from cache", &*id, &username);
+        Either::A(Ok(HttpResponse::Ok().json(GitHubUsername { username })).into_future())
+    } else {
+        let cache = Arc::clone(&*cache);
+        let cache_id = (*id).clone();
+        Either::B(
+            Client::default()
+                .get(format!("{}/{}", USER_URL, id))
+                .header(http::header::USER_AGENT, "whoami")
+                .send()
+                .map_err(Into::into)
+                .and_then(|mut res| {
+                    info!("status: {}", res.status());
+                    res.json::<GitHubUser>().map_err(Into::into)
+                })
+                .map(move |user| {
+                    if let Ok(mut c) = cache.write() {
+                        info!("caching {} → {}", &cache_id, &user.login);
+                        c.insert(cache_id, user.login.clone(), CACHE_DURATION);
+                    }
+                    user
+                })
+                .and_then(|user| {
+                    HttpResponse::Ok().json(GitHubUsername {
+                        username: user.login,
+                    })
+                }),
+        )
+    }
 }
 
 fn redirect(client: web::Data<Arc<BasicClient>>, session: Session) -> impl Responder {
@@ -172,6 +197,7 @@ pub fn github_app<T: AsyncCisClientTrait + 'static>(
     let github_client_secret = ClientSecret::new(github.client_secret.clone());
     let auth_url = AuthUrl::new(Url::parse(AUTH_URL).expect("Invalid authorization endpoint URL"));
     let token_url = TokenUrl::new(Url::parse(TOKEN_URL).expect("Invalid token endpoint URL"));
+    let ttl_cache = Arc::new(RwLock::new(TtlCache::<String, String>::new(2000)));
 
     let client = Arc::new(
         BasicClient::new(
@@ -207,6 +233,7 @@ pub fn github_app<T: AsyncCisClientTrait + 'static>(
         )
         .data(client)
         .data(cis_client)
+        .data(ttl_cache)
         .service(web::resource("/add").route(web::get().to(redirect)))
         .service(web::resource("/auth").route(web::get().to_async(auth::<T>)))
         .service(web::resource("/username/{id}").route(web::get().to_async(id_to_username)))

src/github/app.rs

@@ -1,6 +1,6 @@
+use actix_cors::Cors;
 use actix_web::dev::HttpServiceFactory;
 use actix_web::http;
-use actix_web::middleware::cors::Cors;
 use actix_web::web;
 use actix_web::HttpRequest;
 use actix_web::HttpResponse;

src/healthz.rs

@@ -2,6 +2,7 @@
 extern crate log;
 #[macro_use]
 extern crate serde_derive;
+extern crate actix_cors;
 extern crate actix_session;
 extern crate actix_web;
 extern crate base64;
@@ -12,6 +13,7 @@ extern crate env_logger;
 extern crate futures;
 extern crate rand;
 extern crate serde_json;
+extern crate ttl_cache;
 extern crate url;
 
 mod bugzilla;