Add email blacklist functionality

Dockerfile

@@ -2,14 +2,14 @@
 # MailHog Dockerfile
 #
 
-FROM golang:1.18-alpine as builder
+FROM golang:1.13-alpine as builder
 
 # Install MailHog:
 RUN apk --no-cache add --virtual build-dependencies \
     git \
   && mkdir -p /root/gocode \
   && export GOPATH=/root/gocode \
-  && go install github.com/mailhog/MailHog@latest
+  && go get github.com/secforge/MailHog
 
 FROM alpine:3
 # Add mailhog user/group with uid/gid 1000.

README.md

@@ -82,6 +82,7 @@ See [MailHog libraries](docs/LIBRARIES.md) for a list of MailHog client librarie
   * See [Introduction to Jim](/docs/JIM.md) for more information
 * HTTP API to list, retrieve and delete messages
   * See [APIv1](/docs/APIv1.md) and [APIv2](/docs/APIv2.md) documentation for more information
+* Email blacklist functionality to reject messages from/to specific addresses via SMTP
 * [HTTP basic authentication](docs/Auth.md) for MailHog UI and API
 * Multipart MIME support
 * Download individual MIME parts

docs/APIv2/swagger-2.0.yaml

@@ -91,6 +91,60 @@ paths:
                     created:
                       type: string
                       format: date-time
+  /api/v2/blacklist:
+    get:
+      description: |
+        Retrieve a list of blacklisted email addresses
+      responses:
+        200:
+          description: Successful response
+          schema:
+            title: Blacklisted Emails
+            type: array
+            items:
+              type: string
+              description: Email address
+  /api/v2/blacklist/{email}:
+    post:
+      description: |
+        Add an email address to the blacklist
+      parameters:
+        -
+          name: email
+          in: path
+          description: Email address to blacklist
+          required: true
+          type: string
+      responses:
+        200:
+          description: Email successfully added to blacklist
+          schema:
+            type: object
+            properties:
+              success:
+                type: boolean
+        400:
+          description: Email address is required
+    delete:
+      description: |
+        Remove an email address from the blacklist
+      parameters:
+        -
+          name: email
+          in: path
+          description: Email address to remove from blacklist
+          required: true
+          type: string
+      responses:
+        200:
+          description: Email successfully removed from blacklist
+          schema:
+            type: object
+            properties:
+              success:
+                type: boolean
+        400:
+          description: Email address is required
   /api/v2/search:
     get:
       description: |
@@ -190,3 +244,57 @@ paths:
                     created:
                       type: string
                       format: date-time
+  /api/v2/blacklist:
+    get:
+      description: |
+        Retrieve a list of blacklisted email addresses
+      responses:
+        200:
+          description: Successful response
+          schema:
+            title: Blacklisted Emails
+            type: array
+            items:
+              type: string
+              description: Email address
+  /api/v2/blacklist/{email}:
+    post:
+      description: |
+        Add an email address to the blacklist
+      parameters:
+        -
+          name: email
+          in: path
+          description: Email address to blacklist
+          required: true
+          type: string
+      responses:
+        200:
+          description: Email successfully added to blacklist
+          schema:
+            type: object
+            properties:
+              success:
+                type: boolean
+        400:
+          description: Email address is required
+    delete:
+      description: |
+        Remove an email address from the blacklist
+      parameters:
+        -
+          name: email
+          in: path
+          description: Email address to remove from blacklist
+          required: true
+          type: string
+      responses:
+        200:
+          description: Email successfully removed from blacklist
+          schema:
+            type: object
+            properties:
+              success:
+                type: boolean
+        400:
+          description: Email address is required

docs/RELEASES.md

@@ -1,6 +1,16 @@
 MailHog Releases
 ================
 
+### [v1.0.1](https://github.com/secforge/MailHog/releases/v1.0.1)
+
+- Add email blacklist functionality
+- Add APIv2 endpoints for blacklist management:
+  - `GET /api/v2/blacklist` - List blacklisted email addresses  
+  - `POST /api/v2/blacklist/{email}` - Add email to blacklist
+  - `DELETE /api/v2/blacklist/{email}` - Remove email from blacklist
+- Add SMTP rejection for blacklisted sender and recipient addresses
+- Minimal changes to maintain upstream compatibility
+
 ### [v1.0.0](https://github.com/mailhog/MailHog/releases/v1.0.0)
 
 There's still outstanding PRs and issues which haven't been addressed in this release.