Fix

Author: trueleo

server/src/handlers/http.rs

@@ -141,15 +141,15 @@ pub fn configure_routes(cfg: &mut web::ServiceConfig) {
                 .route(
                     web::put()
                         .to(logstream::put_stream)
-                        .auth_stream(Action::CreateStream),
+                        .authorise_for_stream(Action::CreateStream),
                 )
                 // POST "/logstream/{logstream}" ==> Post logs to given log stream
-                .route(web::post().to(ingest::post_event))
+                .route(web::post().to(ingest::post_event).authorise(Action::Ingest))
                 // DELETE "/logstream/{logstream}" ==> Delete log stream
                 .route(
                     web::delete()
                         .to(logstream::delete)
-                        .auth_stream(Action::DeleteStream),
+                        .authorise_for_stream(Action::DeleteStream),
                 )
                 .app_data(web::PayloadConfig::default().limit(MAX_EVENT_PAYLOAD_SIZE)),
         )
@@ -159,29 +159,29 @@ pub fn configure_routes(cfg: &mut web::ServiceConfig) {
                 .route(
                     web::put()
                         .to(logstream::put_alert)
-                        .auth_stream(Action::PutAlert),
+                        .authorise_for_stream(Action::PutAlert),
                 )
                 // GET "/logstream/{logstream}/alert" ==> Get alert for given log stream
                 .route(
                     web::get()
                         .to(logstream::get_alert)
-                        .auth_stream(Action::GetAlert),
+                        .authorise_for_stream(Action::GetAlert),
                 ),
         )
         .service(
             // GET "/logstream/{logstream}/schema" ==> Get schema for given log stream
             web::resource("/schema").route(
                 web::get()
                     .to(logstream::schema)
-                    .auth_stream(Action::GetSchema),
+                    .authorise_for_stream(Action::GetSchema),
             ),
         )
         .service(
             // GET "/logstream/{logstream}/stats" ==> Get stats for given log stream
             web::resource("/stats").route(
                 web::get()
                     .to(logstream::get_stats)
-                    .auth_stream(Action::GetStats),
+                    .authorise_for_stream(Action::GetStats),
             ),
         )
         .service(
@@ -190,13 +190,13 @@ pub fn configure_routes(cfg: &mut web::ServiceConfig) {
                 .route(
                     web::put()
                         .to(logstream::put_retention)
-                        .auth_stream(Action::PutRetention),
+                        .authorise_for_stream(Action::PutRetention),
                 )
                 // GET "/logstream/{logstream}/retention" ==> Get retention for given logstream
                 .route(
                     web::get()
                         .to(logstream::get_retention)
-                        .auth_stream(Action::GetRetention),
+                        .authorise_for_stream(Action::GetRetention),
                 ),
         );
 
@@ -205,15 +205,19 @@ pub fn configure_routes(cfg: &mut web::ServiceConfig) {
         .service(
             web::resource("/{username}")
                 // PUT /user/{username} => Create a new user
-                .route(web::put().to(rbac::put_user).auth(Action::PutUser))
+                .route(web::put().to(rbac::put_user).authorise(Action::PutUser))
                 // DELETE /user/{username} => Delete a user
-                .route(web::delete().to(rbac::delete_user).auth(Action::DeleteUser))
-                .route(web::put().to(rbac::put_roles).auth(Action::PutUser)),
+                .route(
+                    web::delete()
+                        .to(rbac::delete_user)
+                        .authorise(Action::DeleteUser),
+                )
+                .route(web::put().to(rbac::put_roles).authorise(Action::PutUser)),
         )
         .service(
             web::resource("/{username}/roles")
                 // PUT /user/{username}/roles => Put roles for user
-                .route(web::put().to(rbac::put_roles).auth(Action::PutRoles)),
+                .route(web::put().to(rbac::put_roles).authorise(Action::PutRoles)),
         )
         .wrap_fn(|req, srv| {
             // The credentials set in the env vars (P_USERNAME & P_PASSWORD) are treated
@@ -236,13 +240,16 @@ pub fn configure_routes(cfg: &mut web::ServiceConfig) {
         web::scope(&base_path())
             // POST "/query" ==> Get results of the SQL query passed in request body
             .service(
-                web::resource("/query")
-                    .route(web::post().to(query::query).auth_stream(Action::Query)),
+                web::resource("/query").route(
+                    web::post()
+                        .to(query::query)
+                        .authorise_for_stream(Action::Query),
+                ),
             )
             // POST "/ingest" ==> Post logs to given log stream based on header
             .service(
                 web::resource("/ingest")
-                    .route(web::post().to(ingest::ingest).auth(Action::Ingest))
+                    .route(web::post().to(ingest::ingest).authorise(Action::Ingest))
                     .app_data(web::PayloadConfig::default().limit(MAX_EVENT_PAYLOAD_SIZE)),
             )
             // GET "/liveness" ==> Liveness check as per https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#define-a-liveness-command
@@ -254,7 +261,7 @@ pub fn configure_routes(cfg: &mut web::ServiceConfig) {
                     .service(
                         // GET "/logstream" ==> Get list of all Log Streams on the server
                         web::resource("")
-                            .route(web::get().to(logstream::list).auth(Action::ListStream)),
+                            .route(web::get().to(logstream::list).authorise(Action::ListStream)),
                     )
                     .service(
                         // logstream API
@@ -277,19 +284,19 @@ pub fn metrics_path() -> String {
 }
 
 trait RouteExt {
-    fn auth(self, action: Action) -> Self;
-    fn auth_stream(self, action: Action) -> Self;
+    fn authorise(self, action: Action) -> Self;
+    fn authorise_for_stream(self, action: Action) -> Self;
 }
 
 impl RouteExt for Route {
-    fn auth(self, action: Action) -> Self {
+    fn authorise(self, action: Action) -> Self {
         self.wrap(Authorization {
             action,
             stream: false,
         })
     }
 
-    fn auth_stream(self, action: Action) -> Self {
+    fn authorise_for_stream(self, action: Action) -> Self {
         self.wrap(Authorization {
             action,
             stream: true,