diff --git a/.gitignore b/.gitignore
index 1377554..3077462 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
*.swp
+*.iml
+.idea
\ No newline at end of file
diff --git a/README.md b/README.md
index 04b288f..3a73e13 100644
--- a/README.md
+++ b/README.md
@@ -14,22 +14,29 @@ The image contains a default MailSlurper config file (`config.json`). A custom c
Example custom config file `custom-config.json`:
```
{
- "wwwAddress": "0.0.0.0",
- "wwwPort": 8080,
- "serviceAddress": "0.0.0.0",
- "servicePort": 8085,
- "smtpAddress": "0.0.0.0",
- "smtpPort": 2500,
- "dbEngine": "SQLite",
- "dbHost": "",
- "dbPort": 0,
- "dbDatabase": "./mailslurper.db",
- "dbUserName": "",
- "dbPassword": "",
- "maxWorkers": 1000,
- "autoStartBrowser": false,
- "keyFile": "",
- "certFile": ""
+ "wwwAddress": "0.0.0.0",
+ "wwwPort": 8080,
+ "serviceAddress": "0.0.0.0",
+ "servicePort": 8085,
+ "smtpAddress": "0.0.0.0",
+ "smtpPort": 2500,
+ "dbEngine": "SQLite",
+ "dbHost": "",
+ "dbPort": 0,
+ "dbDatabase": "./mailslurper.db",
+ "dbUserName": "",
+ "dbPassword": "",
+ "maxWorkers": 1000,
+ "autoStartBrowser": false,
+ "keyFile": "",
+ "certFile": "",
+ "adminKeyFile": "",
+ "adminCertFile": "",
+ "authenticationScheme": "",
+ "authSecret": "",
+ "authSalt": "",
+ "authTimeoutInMinutes": 120,
+ "credentials": {}
}
```
diff --git a/custom-config.json b/custom-config.json
index 5a6d206..3cc68c1 100644
--- a/custom-config.json
+++ b/custom-config.json
@@ -14,5 +14,12 @@
"maxWorkers": 1000,
"autoStartBrowser": false,
"keyFile": "",
- "certFile": ""
+ "certFile": "",
+ "adminKeyFile": "",
+ "adminCertFile": "",
+ "authenticationScheme": "",
+ "authSecret": "",
+ "authSalt": "",
+ "authTimeoutInMinutes": 120,
+ "credentials": {}
}
\ No newline at end of file
diff --git a/mailslurper/LICENSE b/mailslurper/LICENSE
index bc84a73..c1f191e 100644
--- a/mailslurper/LICENSE
+++ b/mailslurper/LICENSE
@@ -1,5 +1,5 @@
The MIT License (MIT)
-Copyright (c) 2013-2016 Adam Presley
+Copyright (c) 2013-2018 Adam Presley
Permission is hereby granted, free of charge, to any person obtaining a copy of this
software and associated documentation files (the "Software"), to deal in the Software
diff --git a/mailslurper/MailSlurperLogo.ico b/mailslurper/MailSlurperLogo.ico
deleted file mode 100644
index 429f0f7..0000000
Binary files a/mailslurper/MailSlurperLogo.ico and /dev/null differ
diff --git a/mailslurper/MailSlurperLogo.png b/mailslurper/MailSlurperLogo.png
deleted file mode 100644
index 2c90988..0000000
Binary files a/mailslurper/MailSlurperLogo.png and /dev/null differ
diff --git a/mailslurper/README.md b/mailslurper/README.md
index eb75b7b..0a56d85 100644
--- a/mailslurper/README.md
+++ b/mailslurper/README.md
@@ -1,3 +1,5 @@
+
![mailslurper](logo/horizontal.png)
+
MailSlurper
===========
@@ -7,17 +9,16 @@ Compiling
---------
The following are general instructions for compiling MailSlurper. Your details may vary a bit here and there. The below example is based on a Unix-style system, such as Ubuntu or OSX. Furthermore for instructional purposes it is assumed that your GOPATH is set to *~/code/go*, and that you have a folder in your source directory called **github.com**. Your setup may vary. The instructions below also assume you have the following already installed.
-* Go 1.5 (or higher)
+* Go 1.10 (or higher)
* Git
```bash
$ cd ~/code/go/src/github.com
$ mkdir mailslurper
$ cd mailslurper
-$ git clone https://github.com/mailslurper/libmailslurper.git
$ git clone https://github.com/mailslurper/mailslurper.git
$ go get github.com/mjibson/esc
-$ cd mailslurper
+$ cd mailslurper/cmd/mailslurper
$ go get
$ go generate
$ go build
@@ -27,31 +28,33 @@ Library and Framework Credits
-----------------------------
This application uses a lot of great open source libraries.
-* [Gorilla Mux](http://www.gorillatoolkit.org/pkg/mux)
-* [Gorilla Context](http://www.gorillatoolkit.org/pkg/context)
-* [Gorilla Websocket](https://github.com/gorilla/websocket)
-* [Alice](https://github.com/justinas/alice)
-* [GoHttpService](https://github.com/adampresley/GoHttpService)
-* [Logging](https://github.com/adampresley/logging)
-* [GoUUID](https://github.com/nu7hatch/gouuid)
-* [bluemonday](https://github.com/microcosm-cc/bluemonday) - BSD 3 Clause. Copyright (c) 2014, David Kitchen david@buro9.com
-* [go-mssqldb](https://github.com/denisenkom/go-mssqldb)
-* [Go-MySQL-Driver](https://github.com/go-sql-driver/mysql) - Mozilla Public License Version 2.0
-* [go-sqlite3](https://github.com/mattn/go-sqlite3) - MIT
-* [esc](https://github.com/mjibson/esc) - MIT
* [BlockUI](http://jquery.malsup.com/block/) - MIT
+* [bluemonday](https://github.com/microcosm-cc/bluemonday) - BSD 3-Clause
* [Bootstrap](http://getbootstrap.com/) - MIT
-* [Date Range Picker for Bootstrap](http://www.daterangepicker.com) - MIT
* [bootstrap-dialog](https://github.com/nakupanda/bootstrap3-dialog) - MIT
* [bootstrap-growl](https://github.com/ifightcrime/bootstrap-growl) - MIT
+* [Date Range Picker for Bootstrap](http://www.daterangepicker.com) - MIT
+* [Gorilla Context](https://github.com/gorilla/context) - BSD 3-Clause
+* [Gorilla Secure Cookie](https://github.com/gorilla/securecookie) - BSD 3-Clause
+* [Gorilla Sessions](https://github.com/gorilla/sessions) - BSD 3-Clause
+* [Copier](https://github.com/jinzhu/copier) - MIT
+* [Echo](https://github.com/labstack/echo) - MIT
+* [errors](https://github.com/pkg/errors) - BSD 2-Clause
+* [esc](https://github.com/mjibson/esc) - MIT
* [Font Awesome](http://fortawesome.github.io/Font-Awesome/) - Fonts under OFL License, CSS under MIT license
+* [GoUUID](https://github.com/nu7hatch/gouuid) - MIT
+* [go-cache](https://github.com/patrickmn/go-cache) - MIT
+* [go-mssqldb](https://github.com/denisenkom/go-mssqldb)
+* [Go-MySQL-Driver](https://github.com/go-sql-driver/mysql) - Mozilla Public License Version 2.0
+* [go-sqlite3](https://github.com/mattn/go-sqlite3) - MIT
* [Handlebars](http://handlebarsjs.com) - MIT
* [jQuery](http://jquery.com/) - MIT
+* [jwt-go](https://github.com/dgrijalva/jwt-go) - MIT
* [lightbox2](http://lokeshdhakar.com/projects/lightbox2/) - MIT
+* [Logrus](https://github.com/sirupsen/logrus) - MIT
* [Moment.js](http://momentjs.com) - MIT
-* [Promiscuous](https://github.com/RubenVerborgh/promiscuous) - MIT
-* [RequireJS Handlebars Plugin](https://github.com/SlexAxton/require-handlebars-plugin) - WTFPL License
-* [RequireJS](http://requirejs.org) - MIT
+* [NPO](https://github.com/getify/native-promise-only) - MIT
+* [open](https://github.com/skratchdot/open-golang) - MIT
Themes by Thomas Park at [Bootswatch](http://bootswatch.com/).
@@ -59,7 +62,7 @@ License
-------
The MIT License (MIT)
-Copyright (c) 2013-2016 Adam Presley
+Copyright (c) 2013-2018 Adam Presley
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/mailslurper/config.json b/mailslurper/config.json
index de83657..0a556e1 100644
--- a/mailslurper/config.json
+++ b/mailslurper/config.json
@@ -14,5 +14,12 @@
"maxWorkers": 1000,
"autoStartBrowser": false,
"keyFile": "",
- "certFile": ""
+ "certFile": "",
+ "adminKeyFile": "",
+ "adminCertFile": "",
+ "authenticationScheme": "",
+ "authSecret": "",
+ "authSalt": "",
+ "authTimeoutInMinutes": 120,
+ "credentials": {}
}
\ No newline at end of file
diff --git a/mailslurper/scripts/create-mssql.sql b/mailslurper/create-mssql.sql
similarity index 100%
rename from mailslurper/scripts/create-mssql.sql
rename to mailslurper/create-mssql.sql
diff --git a/mailslurper/scripts/create-mysql.sql b/mailslurper/create-mysql.sql
similarity index 100%
rename from mailslurper/scripts/create-mysql.sql
rename to mailslurper/create-mysql.sql
diff --git a/mailslurper/createcredentials b/mailslurper/createcredentials
new file mode 100755
index 0000000..41a7a68
Binary files /dev/null and b/mailslurper/createcredentials differ
diff --git a/mailslurper/logo.png b/mailslurper/logo.png
new file mode 100644
index 0000000..8271140
Binary files /dev/null and b/mailslurper/logo.png differ
diff --git a/mailslurper/mailslurper b/mailslurper/mailslurper
index 700fe27..6d95549 100755
Binary files a/mailslurper/mailslurper and b/mailslurper/mailslurper differ
diff --git a/mailslurper/scripts/generate-cert.sh b/mailslurper/scripts/generate-cert.sh
deleted file mode 100755
index 5af512e..0000000
--- a/mailslurper/scripts/generate-cert.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-openssl genrsa -out mailslurper-key.pem 1024
-openssl req -new -key mailslurper-key.pem -out mailslurper.csr
-openssl x509 -req -in mailslurper.csr -signkey mailslurper-key.pem -out mailslurper-cert.pem