Skip to content

Commit

Permalink
Fixes #15352: Fix 5.1 relay-api doc
Browse files Browse the repository at this point in the history
  • Loading branch information
amousset committed Jul 30, 2019
1 parent 1d936f1 commit 1c37957
Showing 1 changed file with 0 additions and 57 deletions.
57 changes: 0 additions & 57 deletions relay/sources/relayd/src/shared_files.rs
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ use openssl::pkey::Public;
use openssl::rsa::Rsa;
use openssl::sign::Verifier;
use regex::Regex;
use reqwest;
use sha2::{Digest, Sha256, Sha512};
use std::fmt;
use std::fs;
Expand Down Expand Up @@ -278,41 +277,6 @@ pub fn parse_parameter_from_raw(raw: String) -> String {
.collect::<String>()
}

#[cfg(test)]
mod tests {
use super::*;
use openssl::sign::Signer;

#[test]
pub fn it_writes_the_metadata() {
let metadata = Metadata {
header: "rudder-signature-v1".to_string(),
algorithm: "sha256".to_string(),
digest: "8ca9efc5752e133e2e80e2661c176fa50f".to_string(),
hash_value: "a75fda39a7af33eb93ab1c74874dcf66d5761ad30977368cf0c4788cf5bfd34f"
.to_string(),
short_pubkey: "shortpubkey".to_string(),
hostname: "ubuntu-18-04-64".to_string(),
keydate: "2018-10-3118:21:43.653257143".to_string(),
keyid: "B29D02BB".to_string(),
expires: "1d 1h".to_string(),
};

assert_eq!(format!("{}", metadata), format!("header=rudder-signature-v1\nalgorithm=sha256\ndigest=8ca9efc5752e133e2e80e2661c176fa50f\nhash_value=a75fda39a7af33eb93ab1c74874dcf66d5761ad30977368cf0c4788cf5bfd34f\nshort_pubkey=shortpubkey\nhostname=ubuntu-18-04-64\nkeydate=2018-10-3118:21:43.653257143\nkeyid=B29D02BB\nexpires={}\n", parse_ttl("1d 1h".to_string()).unwrap()));
}

pub fn send_file(file_id: String, source_uuid: String, target_uuid: String) {
let file_test = fs::File::open("target/tmp/test_send_file.txt").unwrap();
let client = reqwest::Client::new();
let _res = client
.put(&format!(
"https://relay/rudder/relay-api/shared-files/{}/{}/{}",
target_uuid, source_uuid, file_id
))
.body(file_test)
.send();
}

#[cfg(test)]
mod tests {
use super::*;
Expand Down Expand Up @@ -371,25 +335,4 @@ z5VEb9yx2KikbWyChM1Akp82AV5BzqE80QIBIw==".to_string()).unwrap(),
assert!(validate_signature(data, keypub, HashType::Sha512, &signature).unwrap());
}

#[test]
pub fn it_validates_signatures() {
// Generate a keypair
let k0 = Rsa::generate(2048).unwrap();
let k0pkey = k0.public_key_to_pem().unwrap();
let k1 = Rsa::public_key_from_pem(&k0pkey).unwrap();

let keypriv = PKey::from_rsa(k0).unwrap();
let keypub = PKey::from_rsa(k1).unwrap();

let data = b"hello, world!";

// Sign the data
let mut signer = Signer::new(HashType::Sha512.to_openssl_hash(), &keypriv).unwrap();
signer.update(data).unwrap();

let signature = signer.sign_to_vec().unwrap();

assert!(validate_signature(data, keypub, HashType::Sha512, &signature).unwrap());
}

}

0 comments on commit 1c37957

Please sign in to comment.