Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

MaxMind License Key Support #1166

Merged
merged 11 commits into from
Dec 30, 2019
Merged

MaxMind License Key Support #1166

merged 11 commits into from
Dec 30, 2019

Conversation

shawniverson
Copy link
Member

No description provided.

@shawniverson shawniverson mentioned this pull request Dec 26, 2019
Closed
@shawniverson
Copy link
Member Author

Done
Add MAXMIND_LICENSE_KEY to conf
Display message if MAXMIND_LICENSE_KEY is not set in GUI and cron job

Todo
Testing
Validation of MAXMIND_LICENSE_KEY format
Documentation
Other alerts/log/emails as needed (may not be needed, cron will receive output and will fire off to root)

@shawniverson
Copy link
Member Author

Test results with GeoIP Update style key

GUI

Downloading file, please wait...
GeoIP data file successfully downloaded
Download complete, unpacking files...

GeoIP data file successfully unpacked
Process completed!

Cron

Downloading file, please wait...
GeoIP data file successfully downloaded
Download complete, unpacking files...

GeoIP data file successfully unpacked
Process completed!

@shawniverson
Copy link
Member Author

Non GeoIP Update license key

Downloading file, please wait...
GeoIP data file successfully downloaded
Download complete, unpacking files...

GeoIP data file successfully unpacked
Process completed!

Good news is that no matter how a person generates the key from MaxMind, it works either way.

@shawniverson
Copy link
Member Author

Validation added, keys appear to be 16 character alphanumeric key. We'll start with that.

@oschwald
Copy link

Older style keys are 12 characters. It might be worth supporting those too.

endelwar
endelwar reviewed Dec 27, 2019
View reviewed changes
@endelwar
Copy link
Member

Looks good to me, great work @shawniverson!

@shawniverson
Copy link
Member Author

@endelwar PR is out in the wild on the eFa4-Testing repo for the next couple of days. If any issues arise I will update this PR before giving the all clear to merge.

@shawniverson
Copy link
Member Author

@endelwar All clear. Ready to merge. Reports coming back positive. Probably need a blurb to forum and a https://docs.mailwatch.org/ entry once merged and changelog is updated.

@endelwar endelwar merged commit 8fe5cc6 into mailwatch:1.2 Dec 30, 2019
@endelwar
Copy link
Member

Release 1.2.15 published, docs and website updated.

@shawniverson shawniverson deleted the 1.2 branch December 30, 2019 12:26
@atftb
Copy link

atftb commented Dec 31, 2019 via email

@Skywalker-11
Copy link
Member

A new release with the updated MaxMind support is available at https://github.com/mailwatch/MailWatch/releases

When you are logged in on the MaxMind site go to "My License Key". There request a new Key and select that GeoIpUpdate is not used. A licence Key is generated (active after 5-15 min.)

You can check if it works via (replace xxxxx with your license key)

wget "https://download.maxmind.com/app/geoip_download?edition_id=GeoLite2-Country&suffix=tar.gz&license_key=xxxxx"

@shawniverson
Copy link
Member Author

@atftb Look for "MAXMIND_LICENSE_KEY" in conf.php for mailwatch, and set it after obtaining it. That's it :) Your geoip_update.php will use it, and if you use the cron job, it will use it too.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@endelwar endelwar endelwar left review comments

@Skywalker-11 Skywalker-11 Skywalker-11 left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@shawniverson @oschwald @endelwar @atftb @Skywalker-11