Revert "Merge #1263"

This reverts commit 487166c, reversing
changes made to 4ad168f.

We've been seeing segfaults happen on a regular basis since this was
deployed. This is the only commit in that deploy which could be causing
it.

Author: sgrif

Cargo.lock

@@ -28,22 +28,22 @@ rustdoc-args = [
 
 [dependencies]
 cargo-registry-s3 = { path = "src/s3", version = "0.2.0" }
-rand = "0.4"
+rand = "0.3"
 git2 = "0.6.4"
-flate2 = "1.0"
+flate2 = "0.2"
 semver = "0.5"
-url = "1.2"
+url = "1.2.1"
 tar = "0.4.13"
 
-openssl = "0.10.0"
+openssl = "0.9.14"
 curl = "0.4"
 oauth2 = "0.3"
 log = "0.3"
-env_logger = "0.5"
-hex = "0.3"
+env_logger = "0.4"
+hex = "0.2"
 htmlescape = "0.3.1"
 license-exprs = "^1.3"
-dotenv = "0.11.0"
+dotenv = "0.10.0"
 toml = "0.4"
 diesel = { version = "1.1.0", features = ["postgres", "serde_json", "chrono", "r2d2"] }
 diesel_full_text_search = "1.0.0"
@@ -54,13 +54,11 @@ chrono = { version = "0.4.0", features = ["serde"] }
 comrak = { version = "0.2.3", default-features = false }
 ammonia = "1.0.0"
 docopt = "0.8.1"
-itertools = "0.7.0"
+itertools = "0.6.0"
+lettre = "0.6"
 scheduled-thread-pool = "0.2.0"
 derive_deref = "1.0.0"
 
-lettre = "0.7"
-lettre_email = "0.7"
-
 conduit = "0.8"
 conduit-conditional-get = "0.8"
 conduit-cookie = "0.8"
@@ -82,7 +80,7 @@ tokio-core = "0.1"
 tokio-service = "0.1"
 
 [build-dependencies]
-dotenv = "0.11"
+dotenv = "0.10"
 diesel = { version = "1.1.0", features = ["postgres"] }
 diesel_migrations = { version = "1.1.0", features = ["postgres"] }
 

Cargo.toml

@@ -220,7 +220,10 @@ fn get_readme(config: &Config, version: &Version, krate_name: &str) -> Option<St
         return None;
     }
     let reader = Cursor::new(response);
-    let reader = GzDecoder::new(reader);
+    let reader = GzDecoder::new(reader).expect(&format!(
+        "[{}-{}] Invalid gzip header",
+        krate_name, version.num
+    ));
     let mut archive = Archive::new(reader);
     let mut entries = archive.entries().expect(&format!(
         "[{}-{}] Invalid tar archive entries",

src/bin/render-readmes.rs

@@ -14,7 +14,7 @@ use std::sync::mpsc::channel;
 
 fn main() {
     // Initialize logging
-    env_logger::init();
+    env_logger::init().unwrap();
     let config: cargo_registry::Config = Default::default();
 
     // If there isn't a git checkout containing the crate index repo at the path specified

src/bin/server.rs

@@ -140,14 +140,11 @@ pub fn publish(req: &mut Request) -> CargoResult<Response> {
                 .upload_crate(req, &krate, readme, max, max_unpack, vers)?;
         version.record_readme_rendering(&conn)?;
 
-        let mut hex_cksum = String::new();
-        cksum.write_hex(&mut hex_cksum)?;
-
         // Register this crate in our local git repo.
         let git_crate = git::Crate {
             name: name.to_string(),
             vers: vers.to_string(),
-            cksum: hex_cksum,
+            cksum: cksum.to_hex(),
             features,
             deps: git_deps,
             yanked: Some(false),

src/controllers/krate/publish.rs

@@ -2,13 +2,12 @@ use dotenv::dotenv;
 use std::env;
 use std::path::Path;
 use util::{bad_request, CargoResult};
-
-use lettre::file::FileEmailTransport;
-use lettre::EmailTransport;
-use lettre::smtp::SmtpTransport;
-use lettre::smtp::authentication::{Credentials, Mechanism};
-
-use lettre_email::{Email, EmailBuilder};
+use lettre::email::{Email, EmailBuilder};
+use lettre::transport::file::FileEmailTransport;
+use lettre::transport::EmailTransport;
+use lettre::transport::smtp::{SecurityLevel, SmtpTransportBuilder};
+use lettre::transport::smtp::SUBMISSION_PORT;
+use lettre::transport::smtp::authentication::Mechanism;
 
 #[derive(Debug)]
 pub struct MailgunConfigVars {
@@ -77,21 +76,20 @@ fn send_email(recipient: &str, subject: &str, body: &str) -> CargoResult<()> {
 
     match mailgun_config {
         Some(mailgun_config) => {
-            let mut transport = SmtpTransport::simple_builder(mailgun_config.smtp_server)?
-                .credentials(Credentials::new(
-                    mailgun_config.smtp_login,
-                    mailgun_config.smtp_password,
-                ))
-                .smtp_utf8(true)
-                .authentication_mechanism(Mechanism::Plain)
-                .build();
+            let mut transport =
+                SmtpTransportBuilder::new((mailgun_config.smtp_server.as_str(), SUBMISSION_PORT))?
+                    .credentials(&mailgun_config.smtp_login, &mailgun_config.smtp_password)
+                    .security_level(SecurityLevel::AlwaysEncrypt)
+                    .smtp_utf8(true)
+                    .authentication_mechanism(Mechanism::Plain)
+                    .build();
 
-            let result = transport.send(&email);
+            let result = transport.send(email.clone());
             result.map_err(|_| bad_request("Error in sending email"))?;
         }
         None => {
             let mut sender = FileEmailTransport::new(Path::new("/tmp"));
-            let result = sender.send(&email);
+            let result = sender.send(email.clone());
             result.map_err(|_| bad_request("Email file could not be generated"))?;
         }
     }

src/email.rs

@@ -22,7 +22,6 @@ extern crate git2;
 extern crate hex;
 extern crate htmlescape;
 extern crate lettre;
-extern crate lettre_email;
 extern crate license_exprs;
 #[macro_use]
 extern crate log;

src/lib.rs

@@ -13,7 +13,7 @@ name = "s3"
 path = "lib.rs"
 
 [dependencies]
-openssl = "0.10"
+openssl = "0.9"
 chrono = "0.4"
 curl = "0.4"
-base64 = "0.9"
+base64 = "0.6"

src/s3/Cargo.toml

@@ -134,7 +134,7 @@ impl Bucket {
             let key = PKey::hmac(self.secret_key.as_bytes()).unwrap();
             let mut signer = Signer::new(MessageDigest::sha1(), &key).unwrap();
             signer.update(string.as_bytes()).unwrap();
-            encode(&signer.sign_to_vec().unwrap()[..])
+            encode(&signer.finish().unwrap()[..])
         };
         format!("AWS {}:{}", self.access_key, signature)
     }

src/s3/lib.rs

@@ -696,7 +696,7 @@ fn new_crate_to_body_with_io(
 ) -> Vec<u8> {
     let mut tarball = Vec::new();
     {
-        let mut ar = tar::Builder::new(GzEncoder::new(&mut tarball, Compression::default()));
+        let mut ar = tar::Builder::new(GzEncoder::new(&mut tarball, Compression::Default));
         for &mut (name, ref mut data, size) in files {
             let mut header = tar::Header::new_gnu();
             t!(header.set_path(name));

src/tests/all.rs

@@ -1 +1 @@
-[{"request":{"uri":"http://alexcrichton-test.s3.amazonaws.com/crates/foo_whitelist/foo_whitelist-1.1.0.crate","method":"PUT","headers":[["Authorization","AWS AKIAICL5IWUZYWWKA7JA:qt4nSgvxT4p0mzUU9mA+lDtnKdE="],["Proxy-Connection","Keep-Alive"],["Date","Fri, 15 Sep 2017 07:53:06 -0700"],["Accept","*/*"],["Content-Type","application/x-tar"],["Host","alexcrichton-test.s3.amazonaws.com"],["Content-Length","96"]],"body":[31, 139, 8, 0, 0, 0, 0, 0, 0, 255, 237, 198, 77, 10, 128, 32, 16, 6, 208, 57, 138, 23, 200, 212, 160, 57, 78, 24, 244, 51, 16, 8, 57, 209, 245, 67, 162, 125, 43, 33, 250, 222, 234, 205, 41, 13, 231, 42, 58, 109, 146, 181, 241, 214, 91, 215, 142, 178, 80, 13, 238, 214, 113, 112, 207, 139, 114, 238, 3, 83, 21, 71, 214, 184, 27, 67, 63, 21, 1, 0, 0, 224, 243, 8, 0, 224, 165, 11, 110, 88, 191, 250, 0, 14, 0, 0]},"response":{"status":200,"headers":[["Date","Fri, 15 Sep 2017 14:53:07 GMT"],["x-amz-request-id","A154F439BE2F1178"],["Server","AmazonS3"],["ETag","\"9facb520b24bd39bb1ee070422257b83\""],["x-amz-id-2","sJQf1gwHhtO9UupUzVzcH5l1yvS64tKrNFy59yuhFRCrLpSEGAAm/S4LNhUDFCqS2HOsyw0FXBo="],["Content-Length","0"]],"body":[]}}]
+[{"request":{"uri":"http://alexcrichton-test.s3.amazonaws.com/crates/foo_whitelist/foo_whitelist-1.1.0.crate","method":"PUT","headers":[["Authorization","AWS AKIAICL5IWUZYWWKA7JA:qt4nSgvxT4p0mzUU9mA+lDtnKdE="],["Proxy-Connection","Keep-Alive"],["Date","Fri, 15 Sep 2017 07:53:06 -0700"],["Accept","*/*"],["Content-Type","application/x-tar"],["Host","alexcrichton-test.s3.amazonaws.com"],["Content-Length","95"]],"body":[31,139,8,0,0,0,0,0,0,255,237,200,61,10,128,48,12,6,208,28,37,23,176,166,10,237,113,164,130,63,1,161,96,35,94,223,193,205,201,169,32,126,111,124,115,206,195,185,170,77,155,22,107,188,243,78,218,81,23,170,65,110,125,236,228,249,33,72,100,170,225,40,150,118,102,250,169,4,0,0,0,159,71,0,0,47,93,157,95,173,158,0,14,0,0]},"response":{"status":200,"headers":[["Date","Fri, 15 Sep 2017 14:53:07 GMT"],["x-amz-request-id","A154F439BE2F1178"],["Server","AmazonS3"],["ETag","\"9facb520b24bd39bb1ee070422257b83\""],["x-amz-id-2","sJQf1gwHhtO9UupUzVzcH5l1yvS64tKrNFy59yuhFRCrLpSEGAAm/S4LNhUDFCqS2HOsyw0FXBo="],["Content-Length","0"]],"body":[]}}]

src/tests/http-data/krate_new_krate_too_big_but_whitelisted

@@ -250,7 +250,7 @@ fn verify_tarball(
     max_unpack: u64,
 ) -> CargoResult<()> {
     // All our data is currently encoded with gzip
-    let decoder = GzDecoder::new(tarball);
+    let decoder = GzDecoder::new(tarball)?;
 
     // Don't let gzip decompression go into the weeeds, apply a fixed cap after
     // which point we say the decompressed source is "too large".
@@ -278,5 +278,5 @@ fn verify_tarball(
 fn hash(data: &[u8]) -> Vec<u8> {
     let mut hasher = Hasher::new(MessageDigest::sha256()).unwrap();
     hasher.update(data).unwrap();
-    hasher.finish().unwrap().to_vec()
+    hasher.finish2().unwrap().to_vec()
 }