Check oauth scopes and reject unauthorized requests

src/main.rs

@@ -40,7 +40,7 @@ use receiver::Receiver;
 use std::env;
 use std::net::SocketAddr;
 use stream::StreamManager;
-use user::{Scope, User};
+use user::{OauthScope::*, Scope, User};
 use warp::path;
 use warp::Filter as WarpFilter;
 
@@ -110,29 +110,49 @@ fn main() {
                   h: query::Hashtag,
                   l: query::List,
                   ws: warp::ws::Ws2| {
-                let unauthorized = Err(warp::reject::custom("Error: Invalid Access Token"));
+                let scopes = user.scopes.clone();
                 let timeline = match q.stream.as_ref() {
                     // Public endpoints:
                     tl @ "public" | tl @ "public:local" if m.is_truthy() => format!("{}:media", tl),
                     tl @ "public:media" | tl @ "public:local:media" => tl.to_string(),
                     tl @ "public" | tl @ "public:local" => tl.to_string(),
-                    // User
-                    "user" if user.id == -1 => return unauthorized,
-                    "user" => format!("{}", user.id),
-                    "user:notification" => {
-                        user = user.with_notification_filter();
-                        format!("{}", user.id)
-                    }
                     // Hashtag endpoints:
                     // TODO: handle missing query
                     tl @ "hashtag" | tl @ "hashtag:local" => format!("{}:{}", tl, h.tag),
+                    // Private endpoints: User
+                    "user"
+                        if user.id > 0
+                            && (scopes.contains(&Read) || scopes.contains(&ReadStatuses)) =>
+                    {
+                        format!("{}", user.id)
+                    }
+                    "user:notification"
+                        if user.id > 0
+                            && (scopes.contains(&Read) || scopes.contains(&ReadNotifications)) =>
+                    {
+                        user = user.with_notification_filter();
+                        format!("{}", user.id)
+                    }
                     // List endpoint:
                     // TODO: handle missing query
-                    "list" if user.authorized_for_list(l.list).is_err() => return unauthorized,
-                    "list" => format!("list:{}", l.list),
+                    "list"
+                        if user.authorized_for_list(l.list).is_ok()
+                            && (scopes.contains(&Read) || scopes.contains(&ReadList)) =>
+                    {
+                        format!("list:{}", l.list)
+                    }
+
                     // Direct endpoint:
-                    "direct" if user.id == -1 => return unauthorized,
-                    "direct" => "direct".to_string(),
+                    "direct"
+                        if user.id > 0
+                            && (scopes.contains(&Read) || scopes.contains(&ReadStatuses)) =>
+                    {
+                        "direct".to_string()
+                    }
+                    // Reject unathorized access attempts for private endpoints
+                    "user" | "user:notification" | "direct" | "list" => {
+                        return Err(warp::reject::custom("Error: Invalid Access Token"))
+                    }
                     // Other endpoints don't exist:
                     _ => return Err(warp::reject::custom("Error: Nonexistent WebSocket query")),
                 };

src/user.rs

@@ -28,18 +28,42 @@ pub enum Filter {
 pub struct User {
     pub id: i64,
     pub access_token: String,
+    pub scopes: Vec<OauthScope>,
     pub langs: Option<Vec<String>>,
     pub logged_in: bool,
     pub filter: Filter,
 }
+#[derive(Clone, Debug, PartialEq)]
+pub enum OauthScope {
+    Read,
+    ReadStatuses,
+    ReadNotifications,
+    ReadList,
+    Other,
+}
+impl From<&str> for OauthScope {
+    fn from(scope: &str) -> Self {
+        use OauthScope::*;
+        match scope {
+            "read" => Read,
+            "read:statuses" => ReadStatuses,
+            "read:notifications" => ReadNotifications,
+            "read:lists" => ReadList,
+            _ => Other,
+        }
+    }
+}
 impl User {
     /// Create a user from the access token supplied in the header or query paramaters
-    pub fn from_access_token(token: String, scope: Scope) -> Result<Self, warp::reject::Rejection> {
+    pub fn from_access_token(
+        access_token: String,
+        scope: Scope,
+    ) -> Result<Self, warp::reject::Rejection> {
         let conn = connect_to_postgres();
         let result = &conn
             .query(
                 "
-SELECT oauth_access_tokens.resource_owner_id, users.account_id, users.chosen_languages
+SELECT oauth_access_tokens.resource_owner_id, users.account_id, users.chosen_languages, oauth_access_tokens.scopes
 FROM
 oauth_access_tokens
 INNER JOIN users ON
@@ -47,17 +71,25 @@ oauth_access_tokens.resource_owner_id = users.id
 WHERE oauth_access_tokens.token = $1
 AND oauth_access_tokens.revoked_at IS NULL
 LIMIT 1",
-                &[&token],
+                &[&access_token],
             )
             .expect("Hard-coded query will return Some([0 or more rows])");
         if !result.is_empty() {
             let only_row = result.get(0);
             let id: i64 = only_row.get(1);
+            let scopes = only_row
+                .get::<_, String>(3)
+                .split(' ')
+                .map(|scope: &str| scope.into())
+                .filter(|scope| scope != &OauthScope::Other)
+                .collect();
+            dbg!(&scopes);
             let langs: Option<Vec<String>> = only_row.get(2);
             info!("Granting logged-in access");
             Ok(User {
                 id,
-                access_token: token,
+                access_token,
+                scopes,
                 langs,
                 logged_in: true,
                 filter: Filter::None,
@@ -66,7 +98,8 @@ LIMIT 1",
             info!("Granting public access to non-authenticated client");
             Ok(User {
                 id: -1,
-                access_token: token,
+                access_token,
+                scopes: Vec::new(),
                 langs: None,
                 logged_in: false,
                 filter: Filter::None,
@@ -120,6 +153,7 @@ LIMIT 1",
         User {
             id: -1,
             access_token: String::new(),
+            scopes: Vec::new(),
             langs: None,
             logged_in: false,
             filter: Filter::None,