Merge #1533

1533: Rename blacklist_ips to block_ips r=carols10cents a=sgrif



Co-authored-by: Sean Griffin <[email protected]>

Author: bors-voyager[bot]

src/middleware/blacklist_ips.rs renamed to src/middleware/block_ips.rs

@@ -27,13 +27,13 @@ impl AroundMiddleware for BlockIps {
 
 impl Handler for BlockIps {
     fn call(&self, req: &mut dyn Request) -> Result<Response, Box<dyn Error + Send>> {
-        let has_blacklisted_ip = req
+        let has_blocked_ip = req
             .headers()
             .find("X-Forwarded-For")
             .unwrap()
             .iter()
             .any(|v| v.split(", ").any(|ip| self.ips.iter().any(|x| x == ip)));
-        if has_blacklisted_ip {
+        if has_blocked_ip {
             let body = format!(
                 "We are unable to process your request at this time. \
                  Please open an issue at https://github.com/rust-lang/crates.io \

src/middleware/mod.rs

@@ -13,7 +13,7 @@ pub use self::security_headers::SecurityHeaders;
 pub use self::static_or_continue::StaticOrContinue;
 
 pub mod app;
-mod blacklist_ips;
+mod block_ips;
 pub mod current_user;
 mod debug;
 mod ember_index_rewrite;
@@ -81,9 +81,9 @@ pub fn build_middleware(app: Arc<App>, endpoints: R404) -> MiddlewareBuilder {
 
     m.around(Head::default());
 
-    if let Ok(ip_list) = env::var("BLACKLISTED_IPS") {
+    if let Ok(ip_list) = env::var("BLOCKED_IPS") {
         let ips = ip_list.split(',').map(String::from).collect();
-        m.around(blacklist_ips::BlockIps::new(ips));
+        m.around(block_ips::BlockIps::new(ips));
     }
 
     if env != Env::Test {