Merge pull request #7 from amfoss/develop

Major feature and other changes.

Author: ivinjabraham

.github/workflows/deploy.yml

@@ -12,5 +12,7 @@ jobs:
     steps:
       - uses: shuttle-hq/deploy-action@main
         with:
-          deploy-key: ${{ secrets.SHUTTLE_API_KEY }}
           name: "root"
+          deploy-key: ${{ secrets.SHUTTLE_API_KEY }}
+          secrets: |
+            ROOT_SECRET = '${{ secrets.ROOT_SECRET }}'

.github/workflows/shuttle-run.yml

@@ -10,5 +10,8 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Run shuttle project locally. 
+      - name: Run shuttle project locally.
         uses: ivinjabraham/shuttle-run@v1.1
+        with:
+          secrets: |
+            ROOT_SECRET = '${{ secrets.ROOT_SECRET }}'

Cargo.lock

@@ -14,3 +14,6 @@ shuttle-runtime = "0.46.0"
 shuttle-shared-db = { version = "0.46.0", features = ["postgres", "sqlx"] }
 sqlx = { version = "0.7.1", features = ["chrono"] }
 tokio = "1.28.2"
+hmac = "0.12.1"
+sha2 = "0.10.8"
+hex = "0.4.3"

Cargo.toml

@@ -0,0 +1 @@
+ALTER TABLE Attendance RENAME COLUMN ispresent TO is_prresent;

migrations/20240813130838_rename_present_to_isPresent.sql

@@ -0,0 +1 @@
+ALTER TABLE Attendance RENAME COLUMN is_prresent TO is_present;

migrations/20240813131821_rename_present_to_isPresent.sql

@@ -13,4 +13,5 @@ pub struct Member {
     pub email: String,
     pub sex: String,
     pub year: i32,
+    pub macaddress: String,
 }

migrations/20240813132052_rename_present_to_is_present.sql

@@ -1,8 +1,14 @@
 use async_graphql::{Context, Object};
+use ::chrono::Local;
 use chrono::{NaiveDate, NaiveTime};
 use sqlx::PgPool;
 use  sqlx::types::chrono;
 use std::sync::Arc;
+use hmac::{Hmac,Mac};
+use sha2::Sha256;
+
+
+type HmacSha256 = Hmac<Sha256>;
 
 use crate::db::{member::Member, attendance::Attendance};
 
@@ -20,19 +26,24 @@ impl MutationRoot {
         hostel: String, 
         email: String, 
         sex: String, 
-        year: i32
+        year: i32,
+        macaddress: String,
+
     ) -> Result<Member, sqlx::Error> {
         let pool = ctx.data::<Arc<PgPool>>().expect("Pool not found in context");
 
+
+
         let member = sqlx::query_as::<_, Member>(
-            "INSERT INTO Member (rollno, name, hostel, email, sex, year) VALUES ($1, $2, $3, $4, $5, $6) RETURNING *"
+            "INSERT INTO Member (rollno, name, hostel, email, sex, year, macaddress) VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING *"
         )
         .bind(rollno)
         .bind(name)
         .bind(hostel)
         .bind(email)
         .bind(sex)
         .bind(year)
+        .bind(macaddress)
         .fetch_one(pool.as_ref())
         .await?;
 
@@ -42,22 +53,29 @@ impl MutationRoot {
 
     //Mutation for adding attendance to the Attendance table
     async fn add_attendance(
+       
         &self,
+        
         ctx: &Context<'_>,
         id: i32,
         date: NaiveDate,
         timein: NaiveTime,
         timeout: NaiveTime,
+        is_present: bool,
+      
     ) -> Result<Attendance, sqlx::Error> {
         let pool = ctx.data::<Arc<PgPool>>().expect("Pool not found in context");
 
+
         let attendance = sqlx::query_as::<_, Attendance>(
-            "INSERT INTO Attendance (id, date, timein, timeout) VALUES ($1, $2, $3, $4) RETURNING *"
+            "INSERT INTO Attendance (id, date, timein, timeout, is_present) VALUES ($1, $2, $3, $4, $5) RETURNING *"
         )
+        
         .bind(id)
         .bind(date)
         .bind(timein)
         .bind(timeout)
+        .bind(is_present)
         .fetch_one(pool.as_ref())
         .await?;
 
@@ -70,17 +88,53 @@ impl MutationRoot {
         id: i32,
         date: NaiveDate,
         is_present: bool,
+        hmac_signature: String, 
     ) -> Result<Attendance,sqlx::Error> {
+        
         let pool = ctx.data::<Arc<PgPool>>().expect("Pool not found in context");
 
+        let secret_key = ctx.data::<String>().expect("HMAC secret not found in context");
+
+        let mut mac = HmacSha256::new_from_slice(secret_key.as_bytes()).expect("HMAC can take key of any size");
+
+        let message = format!("{}{}{}", id, date, is_present);
+        mac.update(message.as_bytes());
+
+        let expected_signature = mac.finalize().into_bytes();
+        
+      
+        // Convert the received HMAC signature from the client to bytes for comparison
+        let received_signature = hex::decode(hmac_signature)
+            .map_err(|_| sqlx::Error::Protocol("Invalid HMAC signature".into()))?;
+        
+
+        if expected_signature.as_slice() != received_signature.as_slice() {
+            
+            return Err(sqlx::Error::Protocol("HMAC verification failed".into()));
+        }
+
+
+      
+
+        let current_time = Local::now().time();
+
         let attendance = sqlx::query_as::<_, Attendance>(
-            "UPDATE Attendance SET is_present = $1 WHERE id = $2 AND date = $3 RETURNING *"
+            "
+            UPDATE Attendance
+            SET 
+                timein = CASE WHEN timein = '00:00:00' THEN $1 ELSE timein END,
+                timeout = $1,
+                is_present = $2
+            WHERE id = $3 AND date = $4
+            RETURNING *
+            "
         )
+        .bind(current_time)
         .bind(is_present)
         .bind(id)
-        .bind(date)                                                                                                                                                                         
+        .bind(date)
         .fetch_one(pool.as_ref())
-        .await?;                            
+        .await?;
 
         Ok(attendance)
     }

src/db/member.rs

@@ -1,16 +1,16 @@
 
 use std::{env, sync::Arc};
 use tokio::task;
-use tokio::time::{sleep, sleep_until, Instant};
+use tokio::time::{ sleep_until, Instant};
 use std::time::Duration;
 use async_graphql_axum::GraphQL;
 use axum::{routing::get, Router};
 use chrono::{ Local, NaiveTime};
-use db::attendance::Attendance;
+
 use db::member::Member;
 use sqlx::PgPool;
 use async_graphql::{ Schema, EmptySubscription};
-
+use shuttle_runtime::SecretStore;
 use crate::graphql::mutations::MutationRoot;
 use crate::graphql::query::QueryRoot;
 use crate::routes::graphiql;
@@ -22,21 +22,24 @@ mod routes;
 #[derive(Clone)]
 struct MyState {
     pool: Arc<PgPool>,
+    secret_key: String,
 }
 
 //Main method
 #[shuttle_runtime::main]
-async fn main(#[shuttle_shared_db::Postgres] pool: PgPool) -> shuttle_axum::ShuttleAxum {
+async fn main(#[shuttle_shared_db::Postgres] pool: PgPool,#[shuttle_runtime::Secrets] secrets: SecretStore,) -> shuttle_axum::ShuttleAxum {
     env::set_var("PGOPTIONS", "-c ignore_version=true");
 
     sqlx::migrate!().run(&pool).await.expect("Failed to run migrations");
 
     let pool = Arc::new(pool);
+    let secret_key = secrets.get("ROOT_SECRET").expect("ROOT_SECRET not found");
     let schema = Schema::build(QueryRoot, MutationRoot, EmptySubscription)
         .data(pool.clone())
+        .data(secret_key.clone()) //
         .finish();
 
-    let state = MyState { pool: pool.clone() };
+    let state = MyState { pool: pool.clone() , secret_key: secret_key.clone()};
 
     let router = Router::new()
         .route("/", get(graphiql).post_service(GraphQL::new(schema.clone())))