Remove different tokent type option

Author: Mark-Simulacrum

src/server/auth.rs

@@ -14,11 +14,6 @@ lazy_static! {
         Regex::new(r"^crater(-agent)?/(?P<sha>[a-f0-9]{7,40})( \(.*\))?$").unwrap();
 }
 
-#[derive(Copy, Clone)]
-pub enum TokenType {
-    Agent,
-}
-
 pub struct AuthDetails {
     pub name: String,
     pub git_revision: Option<String>,
@@ -45,7 +40,7 @@ fn git_revision(user_agent: &str) -> Option<String> {
         .map(|cap| cap["sha"].to_string())
 }
 
-fn check_auth(data: &Data, headers: &HeaderMap, token_type: TokenType) -> Option<AuthDetails> {
+fn check_auth(data: &Data, headers: &HeaderMap) -> Option<AuthDetails> {
     // Try to extract the git revision from the User-Agent header
     let git_revision = if let Some(ua_value) = headers.get(USER_AGENT) {
         if let Ok(ua) = ua_value.to_str() {
@@ -60,11 +55,7 @@ fn check_auth(data: &Data, headers: &HeaderMap, token_type: TokenType) -> Option
     if let Some(authorization_value) = headers.get(AUTHORIZATION) {
         if let Ok(authorization) = authorization_value.to_str() {
             if let Some(token) = parse_token(authorization) {
-                let tokens = match token_type {
-                    TokenType::Agent => &data.tokens.agents,
-                };
-
-                if let Some(name) = tokens.get(token) {
+                if let Some(name) = data.tokens.agents.get(token) {
                     return Some(AuthDetails {
                         name: name.clone(),
                         git_revision,
@@ -79,12 +70,11 @@ fn check_auth(data: &Data, headers: &HeaderMap, token_type: TokenType) -> Option
 
 pub fn auth_filter(
     data: Arc<Data>,
-    token_type: TokenType,
 ) -> impl Filter<Extract = (AuthDetails,), Error = Rejection> + Clone {
     warp::header::headers_cloned().and_then(move |headers| {
         let data = data.clone();
         async move {
-            match check_auth(&data, &headers, token_type) {
+            match check_auth(&data, &headers) {
                 Some(details) => Ok(details),
                 None => Err(warp::reject::custom(HttpError::Forbidden)),
             }

src/server/routes/agent.rs

@@ -3,7 +3,7 @@ use crate::experiments::{Assignee, Experiment};
 use crate::prelude::*;
 use crate::results::{DatabaseDB, EncodingType, ProgressData};
 use crate::server::api_types::{AgentConfig, ApiResponse};
-use crate::server::auth::{auth_filter, AuthDetails, TokenType};
+use crate::server::auth::{auth_filter, AuthDetails};
 use crate::server::messages::Message;
 use crate::server::{Data, GithubData, HttpError};
 use crossbeam_channel::Sender;
@@ -37,46 +37,46 @@ pub fn routes(
         .and(warp::path::end())
         .and(warp::body::json())
         .and(data_filter.clone())
-        .and(auth_filter(data.clone(), TokenType::Agent))
+        .and(auth_filter(data.clone()))
         .map(endpoint_config);
 
     let next_experiment = warp::post()
         .and(warp::path("next-experiment"))
         .and(warp::path::end())
         .and(mutex_filter.clone())
         .and(github_data_filter)
-        .and(auth_filter(data.clone(), TokenType::Agent))
+        .and(auth_filter(data.clone()))
         .map(endpoint_next_experiment);
 
     let next_crate = warp::post()
         .and(warp::path("next-crate"))
         .and(warp::path::end())
         .and(warp::body::json())
         .and(data_filter.clone())
-        .and(auth_filter(data.clone(), TokenType::Agent))
+        .and(auth_filter(data.clone()))
         .map(endpoint_next_crate);
 
     let record_progress = warp::post()
         .and(warp::path("record-progress"))
         .and(warp::path::end())
         .and(warp::body::json())
         .and(data_filter.clone())
-        .and(auth_filter(data.clone(), TokenType::Agent))
+        .and(auth_filter(data.clone()))
         .map(endpoint_record_progress);
 
     let heartbeat = warp::post()
         .and(warp::path("heartbeat"))
         .and(warp::path::end())
         .and(data_filter)
-        .and(auth_filter(data.clone(), TokenType::Agent))
+        .and(auth_filter(data.clone()))
         .map(endpoint_heartbeat);
 
     let error = warp::post()
         .and(warp::path("error"))
         .and(warp::path::end())
         .and(warp::body::json())
         .and(mutex_filter)
-        .and(auth_filter(data, TokenType::Agent))
+        .and(auth_filter(data))
         .map(endpoint_error);
 
     warp::any()