mirrors/syncstorage-rs
1
0
Fork 0
mirror of https://github.com/mozilla-services/syncstorage-rs.git synced 2026-05-05 12:16:21 +02:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

feat: add an extra sanity check of the db url

Browse Source 
via Url::parse
This commit is contained in:
Philip Jenvey 2020-03-31 15:26:44 -07:00
parent ec1b73a630
commit f58b3bc9b7
No known key found for this signature in database
GPG Key ID: 5B9F83DE4F7EB7FA
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/spanner/purge_ttl/src/main.rs
View File

@ -15,7 +15,7 @@ use googleapis_raw::spanner::v1::{
};
use grpcio::{CallOption, ChannelBuilder, ChannelCredentials, EnvBuilder, MetadataBuilder};
use log::{info, trace, warn};
use url::Url;
use url::{Host, Url};
const SPANNER_ADDRESS: &str = "spanner.googleapis.com:443";
@ -96,17 +96,14 @@ fn main() -> Result<(), Box<dyn Error>> {
env_logger::try_init()?;
const DB_ENV: &str = "SYNC_DATABASE_URL";
const INVALID_DB_ENV: String = format!("Invalid {}", DB_ENV);
let db_url = env::var(DB_ENV).map_err(|_| format!("Invalid or undefined {}", DB_ENV))?;
let url = Url::parse(&db_url).map_err(|e| format!("Invalid {}: {}", DB_ENV, e))?;
eprintln!("url: {}, host: {:?}, path: {:?}", url.to_string(), url.host(), url.path());
if url.scheme() != "spanner" {
if url.scheme() != "spanner" || url.host() != Some(Host::Domain("projects")) {
return Err(format!("Invalid {}", DB_ENV).into());
}
let database = db_url["spanner://".len()..].to_owned();
let database2 = url.host().ok_or_else(|| format!("Invalid {}", DB_ENV))?.to_string() + url.path();
info!("For {} {}", database, database2);
info!("For {}", database);
// Set up the gRPC environment.
let env = Arc::new(EnvBuilder::new().build());