fix: Don't check inputted email if catch-all (#714)

* fix: Don't check inputted email if catch-all * 0.8.15 * Fix lint
reacherhq · Nov 11, 2020 · 5129dd1 · 5129dd1
1 parent 18a97af
commit 5129dd1
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 10 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "check-if-email-exists-cli"
-version = "0.8.14"
+version = "0.8.15"
 default-run = "check_if_email_exists"
 edition = "2018"
 license = "AGPL-3.0"

diff --git a/Dockerfile b/Dockerfile
@@ -3,7 +3,7 @@ FROM alpine
 # `ciee` stands for check-if-email-exists
 WORKDIR /ciee
 # Fetch latest version
-ENV CIEE_VERSION 0.8.14
+ENV CIEE_VERSION 0.8.15
 
 # Install needed libraries
 RUN apk update && \

diff --git a/README.md b/README.md
@@ -98,7 +98,7 @@ Head to the [releases page](https://github.com/amaurymartiny/check-if-email-exis
 
 ```
 > $ check_if_email_exists --help
-check_if_email_exists 0.8.14
+check_if_email_exists 0.8.15
 Check if an email address exists without sending any email.
 
 USAGE:

diff --git a/core/Cargo.toml b/core/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "check-if-email-exists"
-version = "0.8.14"
+version = "0.8.15"
 authors = ["Amaury Martiny <amaury.martiny@protonmail.com>"]
 categories = ["email"]
 description = "Check if an email address exists without sending any email"

diff --git a/core/src/smtp/mod.rs b/core/src/smtp/mod.rs
@@ -203,7 +203,8 @@ async fn email_deliverable(
 				let message = message.to_lowercase();
 				let is_deliverable = message.contains("2.1.5") || 
 					// 250 Recipient address accepted
-					message.contains("recipient address accepted");
+					// 250 Accepted
+					message.contains("accepted");
 				Ok(Deliverability {
 					has_full_inbox: false,
 					is_deliverable,
@@ -357,7 +358,15 @@ async fn create_smtp_future(
 	let is_catch_all = smtp_is_catch_all(&mut smtp_client, domain)
 		.await
 		.unwrap_or(false);
-	let deliverability = email_deliverable(&mut smtp_client, to_email).await?;
+	let deliverability = if is_catch_all {
+		Deliverability {
+			has_full_inbox: false,
+			is_deliverable: true,
+			is_disabled: false,
+		}
+	} else {
+		email_deliverable(&mut smtp_client, to_email).await?
+	};
 
 	smtp_client.close().await?;
 

diff --git a/test_suite/Cargo.toml b/test_suite/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "check-if-email-exists-test-suite"
-version = "0.8.14"
+version = "0.8.15"
 edition = "2018"
 publish = false