Skip to content

Commit 4afe47d

Browse files
committed
Fix various warnings
Signed-off-by: Denys Fedoryshchenko <denys.f@collabora.com>
1 parent 7c050d0 commit 4afe47d

2 files changed

Lines changed: 3 additions & 19 deletions

File tree

src/main.rs

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@ use headers::HeaderMap;
2727
use std::{net::SocketAddr, path::PathBuf};
2828
use tokio::io::AsyncSeekExt;
2929
use tokio_util::io::ReaderStream;
30-
use toml::Table;
31-
32-
const TOKEN: &str = "SuperSecretToken";
3330

3431
#[derive(Parser, Debug)]
3532
#[command(version, about, long_about = None)]
@@ -139,7 +136,7 @@ async fn main() {
139136

140137
if let Some(tlscfg) = tlscfg {
141138
let addr = SocketAddr::from(([0, 0, 0, 0], port));
142-
let listener = axum_server::bind_rustls(addr, tlscfg)
139+
axum_server::bind_rustls(addr, tlscfg)
143140
.serve(app.into_make_service())
144141
.await
145142
.unwrap();
@@ -392,14 +389,6 @@ fn verify_auth_hdr(headers: &HeaderMap) -> &'static str {
392389
return "Invalid Token";
393390
}
394391
}
395-
396-
// We have auth without "Bearer" prefix
397-
// This is what KernelCI uses :(, so we need to support it
398-
if token_parts.len() == 1 && token_parts[0] == TOKEN {
399-
return "";
400-
} else {
401-
return "Invalid Token or format";
402-
}
403392
}
404393
let verif_result = storjwt::verify_jwt_token(token_parts[1]);
405394
match verif_result {
@@ -409,9 +398,4 @@ fn verify_auth_hdr(headers: &HeaderMap) -> &'static str {
409398
return "Invalid Token";
410399
}
411400
}
412-
if token_parts[1] != TOKEN {
413-
return "Invalid Token";
414-
} else {
415-
return "";
416-
}
417401
}

src/storjwt.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::{Args, ReceivedFile};
1+
use crate::{Args};
22
use clap::Parser;
33
use hmac::{Hmac, Mac};
44
use jwt::{Header, Token, VerifyWithKey};
@@ -22,7 +22,7 @@ pub fn verify_jwt_token(token_str: &str) -> Result<BTreeMap<String, String>, jwt
2222
return Err(e);
2323
}
2424
};
25-
let header = token.header();
25+
//let header = token.header();
2626
let claims = token.claims();
2727
let email = claims.get("email");
2828
match email {

0 commit comments

Comments
 (0)