4 files changed, 121 insertions, 22 deletions

diff --git a/Cargo.lock b/Cargo.lock
index 03c6eb0..fa69ae2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,6 +1,37 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
 [[package]]
+name = "aes"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "884391ef1066acaa41e766ba8f596341b96e93ce34f9a43e7d24bf0a0eaf0561"
+dependencies = [
+ "aes-soft",
+ "aesni",
+ "cipher",
+]
+
+[[package]]
+name = "aes-soft"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be14c7498ea50828a38d0e24a765ed2effe92a705885b57d029cd67d45744072"
+dependencies = [
+ "cipher",
+ "opaque-debug",
+]
+
+[[package]]
+name = "aesni"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea2e11f5e94c2f7d386164cc2aa1f97823fed6f259e486940a71c174dd01b0ce"
+dependencies = [
+ "cipher",
+ "opaque-debug",
+]
+
+[[package]]
 name = "aho-corasick"
 version = "0.7.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -71,6 +102,22 @@ dependencies = [
 ]
 
 [[package]]
+name = "block-modes"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57a0e8073e8baa88212fb5823574c02ebccb395136ba9a164ab89379ec6072f0"
+dependencies = [
+ "block-padding",
+ "cipher",
+]
+
+[[package]]
+name = "block-padding"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae"
+
+[[package]]
 name = "buf_redux"
 version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -137,6 +184,15 @@ dependencies = [
 ]
 
 [[package]]
+name = "cipher"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
 name = "cloudabi"
 version = "0.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -319,8 +375,10 @@ dependencies = [
 name = "gradecoin"
 version = "0.1.0"
 dependencies = [
+ "aes",
  "base64 0.13.0",
  "blake2",
+ "block-modes",
  "chrono",
  "hex-literal",
  "jsonwebtoken",
diff --git a/Cargo.toml b/Cargo.toml
index 3b6e71e..b5733b2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -23,6 +23,8 @@ md-5 = "0.9.1"
 rsa = "0.4.0"
 base64 = "0.13.0"
 sha2 = "0.9.3"
+block-modes = "0.7.0"
+aes = "0.6.0"
 
 [dev-dependencies]
 serde_test = "1.0.117"
diff --git a/src/handlers.rs b/src/handlers.rs
index 55d3ab4..21911e1 100644
--- a/src/handlers.rs
+++ b/src/handlers.rs
@@ -1,12 +1,15 @@
-use base64;
 /// API handlers, the ends of each filter chain
+use aes::Aes128;
+use base64;
 use blake2::{Blake2s, Digest};
+use block_modes::block_padding::Pkcs7;
+use block_modes::{BlockMode, Cbc};
 use jsonwebtoken::errors::ErrorKind;
 use jsonwebtoken::{decode, Algorithm, DecodingKey, TokenData, Validation};
 use log::{debug, warn};
 use md5::Md5;
 use parking_lot::RwLockUpgradableReadGuard;
-use rsa::{PaddingScheme, RSAPrivateKey};
+use rsa::{PaddingScheme, RSAPrivateKey, RSAPublicKey};
 use serde::Serialize;
 use serde_json;
 use sha2;
@@ -16,6 +19,9 @@ use warp::{http::StatusCode, reply};
 
 use crate::PRIVATE_KEY;
 
+// Encryption primitive
+type Aes128Cbc = Cbc<Aes128, Pkcs7>;
+
 #[derive(Serialize, Debug)]
 struct GradeCoinResponse {
     res: ResponseType,
@@ -41,21 +47,21 @@ const BEARER: &str = "Bearer ";
 /// the [`AuthRequest.user_id`] of the `request` is not in the list of users that can hold a Gradecoin account
 ///
 /// # Authentication Process
-/// - Gradecoin's Public Key (`G_PK`) is listed on moodle.
-/// - Gradecoin's Private Key (`G_PR`) is loaded here
+/// - Gradecoin's Public Key (`gradecoin_public_key`) is listed on moodle.
+/// - Gradecoin's Private Key (`gradecoin_private_key`) is loaded here
 ///
 /// - Student picks a short temporary key (`k_temp`)
 /// - Creates a JSON object (`auth_plaintext`) with their `metu_id` and `public key` in base64 (PEM) format (`S_PK`):
 /// {
 ///     student_id: "e12345",
+///     passwd: "15 char secret"
 ///     public_key: "---BEGIN PUBLIC KEY..."
 /// }
 ///
-/// - Encrypts the serialized string of `auth_plaintext` with AES in TODO format using the temporary key
-/// (`k_temp`), the result is `auth_ciphertext`, (TODO base64?)
-/// - The temporary key student has picked `k_temp` is encrypted (TODO details) with `G_PK` (TODO
-/// base64?) = `key_ciphertext`
-/// - The payload JSON object (`auth_request`) can be prepared now:
+/// - Encrypts the serialized string of `auth_plaintext` with 128 bit block AES in CBC mode with Pkcs7 padding using the temporary key (`k_temp`), the result is `auth_ciphertext` TODO should this be base64'd?
+/// - The temporary key student has picked `k_temp` is encrypted using RSA with OAEP padding scheme
+/// using sha256 with `gradecoin_public_key` (TODO base64? same as above), giving us `key_ciphertext`
+/// - The payload JSON object (`auth_request`) can be JSON serialized now:
 /// {
 ///     c: "auth_ciphertext"
 ///     key: "key_ciphertext"
@@ -63,8 +69,10 @@ const BEARER: &str = "Bearer ";
 ///
 /// ## Gradecoin Side
 ///
-/// - Upon receiving, we first extract the temporary key by decrypting `key`, receiving `temp_key`
-/// - With this key, we can decrypt c TODO with aes?
+/// - Upon receiving, we first RSA decrypt with OAEP padding scheme using SHA256 with `gradecoin_private_key` as the key and auth_request.key `key` as the ciphertext, receiving `temp_key` (this is the temporary key chosen by student)
+/// - With `temp_key`, we can AES 128 Cbc Pkcs7 decrypt the `auth_request.c`, giving us
+/// auth_plaintext
+/// - The `auth_plaintext` String can be deserialized to [`AuthRequest`]
 /// - We then verify the payload and calculate the User fingerprint
 /// - Finally, create the new [`User`] object, insert to users HashMap `<fingerprint, User>`
 ///
@@ -74,8 +82,11 @@ pub async fn authenticate_user(
 ) -> Result<impl warp::Reply, warp::Rejection> {
     debug!("POST request to /register, authenticate_user");
 
+    // In essence PEM files are just base64 encoded versions of the DER encoded data.
+    // ~tls.mbed.org
+
     // TODO: lazyload or something <14-04-21, yigit> //
-    // This is our key, used to first decrypt the users temporal key
+    // Load our RSA Private Key as DER
     let der_encoded = PRIVATE_KEY
         .lines()
         .filter(|line| !line.starts_with("-"))
@@ -84,23 +95,28 @@ pub async fn authenticate_user(
             data
         });
 
+    // base64(der(pem))
     // Our private key is saved in PEM (base64) format
     let der_bytes = base64::decode(&der_encoded).expect("failed to decode base64 content");
-    let private_key = RSAPrivateKey::from_pkcs1(&der_bytes).expect("failed to parse key");
+    let gradecoin_private_key = RSAPrivateKey::from_pkcs1(&der_bytes).expect("failed to parse key");
 
     let padding = PaddingScheme::new_oaep::<sha2::Sha256>();
-    let dec_key = private_key
+    let temp_key = gradecoin_private_key
         .decrypt(padding, &request.key.as_bytes())
         .expect("failed to decrypt");
 
-    // then decrypt c using key dec_key
+    // decrypt c using key dec_key
+    let cipher = Aes128Cbc::new_var(&temp_key, &request.iv).unwrap();
+    let auth_plaintext = cipher
+        .decrypt_vec(&base64::decode(request.c).unwrap())
+        .unwrap();
 
-    // let request: AuthRequest = serde_json::from_str(&String::from_utf8(dec_data).unwrap()).unwrap();
-    let request;
+    let request: AuthRequest =
+        serde_json::from_str(&String::from_utf8(auth_plaintext).unwrap()).unwrap();
 
     let provided_id = request.student_id.clone();
 
-    let priv_student_id = match MetuId::new(request.student_id, request.passwd) {
+    let privileged_student_id = match MetuId::new(request.student_id) {
         Some(id) => id,
         None => {
             let res_json = warp::reply::json(&GradeCoinResponse {
@@ -117,15 +133,27 @@ pub async fn authenticate_user(
     if userlist.contains_key(&provided_id) {
         let res_json = warp::reply::json(&GradeCoinResponse {
             res: ResponseType::Error,
-            message: "This user is already authenticated".to_owned(),
+            message:
+                "This user is already authenticated, do you think this is a mistake? Contact me"
+                    .to_owned(),
+        });
+
+        return Ok(warp::reply::with_status(res_json, StatusCode::BAD_REQUEST));
+    }
+
+    // We're using this as the validator
+    // I hate myself
+    if let Err(_) = DecodingKey::from_rsa_pem(request.public_key.as_bytes()) {
+        let res_json = warp::reply::json(&GradeCoinResponse {
+            res: ResponseType::Error,
+            message: "The supplied RSA public key is not in valid PEM format".to_owned(),
         });
 
         return Ok(warp::reply::with_status(res_json, StatusCode::BAD_REQUEST));
     }
 
-    // TODO: audit public key, is it valid? <13-04-21, yigit> //
     let new_user = User {
-        user_id: priv_student_id,
+        user_id: privileged_student_id,
         public_key: request.public_key,
         balance: 0,
     };
@@ -146,6 +174,17 @@ pub async fn authenticate_user(
     Ok(warp::reply::with_status(res_json, StatusCode::CREATED))
 }
 
+// fn shed_pem_header_footer(maybe_key: String) -> Result<Vec<u8>, String> {
+//     let der_encoded = maybe_key
+//         .lines()
+//         .filter(|line| !line.starts_with("-"))
+//         .fold(String::new(), |mut data, line| {
+//             data.push_str(&line);
+//             data
+//         });
+//     Ok(base64::decode(&der_encoded).expect("failed to decode base64 content"))
+// }
+
 /// GET /transaction
 /// Returns JSON array of transactions
 /// Cannot fail
@@ -447,7 +486,6 @@ fn authorize_proposer(jwt_token: String, user_pem: &String) -> Result<TokenData<
     debug!("raw_jwt: {:?}", raw_jwt);
 
     // Extract a jsonwebtoken compatible decoding_key from user's public key
-    // TODO: just use this for reading users pem key <13-04-21, yigit> //
     let decoding_key = match DecodingKey::from_rsa_pem(user_pem.as_bytes()) {
         Ok(key) => key,
         Err(j) => {
diff --git a/src/schema.rs b/src/schema.rs
index f159d83..fb88640 100644
--- a/src/schema.rs
+++ b/src/schema.rs
@@ -190,6 +190,7 @@ pub struct AuthRequest {
 #[derive(Serialize, Deserialize, Debug)]
 pub struct InitialAuthRequest {
     pub c: String,
+    pub iv: [u8; 32],
     pub key: String,
 }