diff options
Diffstat (limited to 'web/converse/src')
| -rw-r--r-- | web/converse/src/handlers.rs | 14 | ||||
| -rw-r--r-- | web/converse/src/main.rs | 28 | ||||
| -rw-r--r-- | web/converse/src/oidc.rs | 4 |
3 files changed, 22 insertions, 24 deletions
diff --git a/web/converse/src/handlers.rs b/web/converse/src/handlers.rs index efdffb3f91..d558afbe12 100644 --- a/web/converse/src/handlers.rs +++ b/web/converse/src/handlers.rs @@ -46,13 +46,13 @@ const NEW_THREAD_LENGTH_ERR: &'static str = "Title and body can not be empty!"; /// Represents the state carried by the web server actors. pub struct AppState { /// Address of the database actor - pub db: Addr<Syn, DbExecutor>, + pub db: Addr<DbExecutor>, /// Address of the OIDC actor - pub oidc: Addr<Syn, OidcExecutor>, + pub oidc: Addr<OidcExecutor>, /// Address of the rendering actor - pub renderer: Addr<Syn, Renderer>, + pub renderer: Addr<Renderer>, } pub fn forum_index(state: State<AppState>) -> ConverseResponse { @@ -113,9 +113,9 @@ pub struct NewThreadForm { /// This handler receives a "New thread"-form and redirects the user /// to the new thread after creation. -pub fn submit_thread(state: State<AppState>, - input: Form<NewThreadForm>, - req: HttpRequest<AppState>) -> ConverseResponse { +pub fn submit_thread((state, input, req): (State<AppState>, + Form<NewThreadForm>, + HttpRequest<AppState>)) -> ConverseResponse { // Trim whitespace out of inputs: let input = NewThreadForm { title: input.title.trim().into(), @@ -328,7 +328,7 @@ impl EmbeddedFile for App<AppState> { pub struct RequireLogin; impl <S> Middleware<S> for RequireLogin { - fn start(&self, req: &mut HttpRequest<S>) -> actix_web::Result<Started> { + fn start(&self, req: &HttpRequest<S>) -> actix_web::Result<Started> { let logged_in = req.identity().is_some(); let is_oidc_req = req.path().starts_with("/oidc"); diff --git a/web/converse/src/main.rs b/web/converse/src/main.rs index 55d84b981b..5c8a188fc3 100644 --- a/web/converse/src/main.rs +++ b/web/converse/src/main.rs @@ -90,7 +90,7 @@ fn config_default(name: &str, default: &str) -> String { env::var(name).unwrap_or(default.into()) } -fn start_db_executor() -> Addr<Syn, DbExecutor> { +fn start_db_executor() -> Addr<DbExecutor> { info!("Initialising database connection pool ..."); let db_url = config("DATABASE_URL"); @@ -100,7 +100,7 @@ fn start_db_executor() -> Addr<Syn, DbExecutor> { SyncArbiter::start(2, move || DbExecutor(pool.clone())) } -fn schedule_search_refresh(db: Addr<Syn, DbExecutor>) { +fn schedule_search_refresh(db: Addr<DbExecutor>) { use tokio::prelude::*; use tokio::timer::Interval; use std::time::{Duration, Instant}; @@ -114,7 +114,7 @@ fn schedule_search_refresh(db: Addr<Syn, DbExecutor>) { thread::spawn(|| tokio::run(task)); } -fn start_oidc_executor(base_url: &str) -> Addr<Syn, OidcExecutor> { +fn start_oidc_executor(base_url: &str) -> Addr<OidcExecutor> { info!("Initialising OIDC integration ..."); let oidc_url = config("OIDC_DISCOVERY_URL"); let oidc_config = oidc::load_oidc(&oidc_url) @@ -130,7 +130,7 @@ fn start_oidc_executor(base_url: &str) -> Addr<Syn, OidcExecutor> { oidc.start() } -fn start_renderer() -> Addr<Syn, Renderer> { +fn start_renderer() -> Addr<Renderer> { let comrak = comrak::ComrakOptions{ github_pre_lang: true, ext_strikethrough: true, @@ -155,9 +155,9 @@ fn gen_session_key() -> [u8; 64] { } fn start_http_server(base_url: String, - db_addr: Addr<Syn, DbExecutor>, - oidc_addr: Addr<Syn, OidcExecutor>, - renderer_addr: Addr<Syn, Renderer>) { + db_addr: Addr<DbExecutor>, + oidc_addr: Addr<OidcExecutor>, + renderer_addr: Addr<Renderer>) { info!("Initialising HTTP server ..."); let bind_host = config_default("CONVERSE_BIND_HOST", "127.0.0.1:4567"); let key = gen_session_key(); @@ -182,14 +182,14 @@ fn start_http_server(base_url: String, .middleware(identity) .resource("/", |r| r.method(Method::GET).with(forum_index)) .resource("/thread/new", |r| r.method(Method::GET).with(new_thread)) - .resource("/thread/submit", |r| r.method(Method::POST).with3(submit_thread)) - .resource("/thread/reply", |r| r.method(Method::POST).with3(reply_thread)) - .resource("/thread/{id}", |r| r.method(Method::GET).with3(forum_thread)) - .resource("/post/{id}/edit", |r| r.method(Method::GET).with3(edit_form)) - .resource("/post/edit", |r| r.method(Method::POST).with3(edit_post)) - .resource("/search", |r| r.method(Method::GET).with2(search_forum)) + .resource("/thread/submit", |r| r.method(Method::POST).with(submit_thread)) + .resource("/thread/reply", |r| r.method(Method::POST).with(reply_thread)) + .resource("/thread/{id}", |r| r.method(Method::GET).with(forum_thread)) + .resource("/post/{id}/edit", |r| r.method(Method::GET).with(edit_form)) + .resource("/post/edit", |r| r.method(Method::POST).with(edit_post)) + .resource("/search", |r| r.method(Method::GET).with(search_forum)) .resource("/oidc/login", |r| r.method(Method::GET).with(login)) - .resource("/oidc/callback", |r| r.method(Method::POST).with3(callback)) + .resource("/oidc/callback", |r| r.method(Method::POST).with(callback)) .static_file("/static/highlight.css", include_bytes!("../static/highlight.css")) .static_file("/static/highlight.js", include_bytes!("../static/highlight.js")) .static_file("/static/styles.css", include_bytes!("../static/styles.css")); diff --git a/web/converse/src/oidc.rs b/web/converse/src/oidc.rs index 970aeb92aa..8491435968 100644 --- a/web/converse/src/oidc.rs +++ b/web/converse/src/oidc.rs @@ -27,8 +27,6 @@ use reqwest; use url::Url; use url_serde; use errors::*; -use reqwest::header::Authorization; -use hyper::header::Bearer; /// This structure represents the contents of an OIDC discovery /// document. @@ -130,7 +128,7 @@ impl Handler<RetrieveToken> for OidcExecutor { let token: TokenResponse = response.json()?; let user: Userinfo = client.get(&self.oidc_config.userinfo_endpoint) - .header(Authorization(Bearer { token: token.access_token })) + .header("Authorization", format!("Bearer {}", token.access_token )) .send()? .json()?; |