From 073ef4f4390c2028aab754fb7fe4c1d8b013c27f Mon Sep 17 00:00:00 2001 From: Maarten Billemont Date: Sun, 3 Jun 2018 16:26:08 -0400 Subject: [PATCH] Update to masterpassword.app domain. --- README.md | 8 ++-- gradle/homebrew-mpw.rb | 42 +++++++++++-------- .../Source/Mac/MPInitialWindowController.m | 2 +- .../Source/iOS/MPPreferencesViewController.m | 4 +- .../Source/iOS/MPWebViewController.m | 2 +- .../Source/iOS/Storyboard.storyboard | 6 +-- platform-independent/cli-c/cli/mpw-bench.c | 2 +- platform-independent/cli-c/cli/mpw-cli.c | 2 +- platform-independent/cli-c/cli/mpw-tests.c | 2 +- platform-independent/cli-c/distribute | 2 +- .../com/lyndir/masterpassword/gui/GUI.java | 6 +-- platform-independent/web-js/index.html | 4 +- platform-independent/web-js/sync | 4 +- 13 files changed, 47 insertions(+), 39 deletions(-) diff --git a/README.md b/README.md index 2e1edd08..47d0d037 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ -# [Master Password •••|](http://masterpasswordapp.com) +# [Master Password •••|](http://masterpassword.app) Master Password is a completely new way of thinking about passwords. @@ -13,7 +13,7 @@ It consists of an algorithm that implements the core idea and applications for v To skip the intro and go straight to the information on how to use the code, [click here](#source-code). -Master Password is available for [📲 iOS](https://itunes.apple.com/app/id510296984), [🖥 macOS](https://masterpasswordapp.com/masterpassword-mac.zip), [📲 Android](https://masterpasswordapp.com/masterpassword-android.apk), [🖥 Desktop](https://masterpasswordapp.com/masterpassword-gui.jar), and [⌨ Console](https://masterpasswordapp.com/masterpassword-cli.tar.gz). +Master Password is available for [📲 iOS](https://itunes.apple.com/app/id510296984), [🖥 macOS](https://masterpassword.app/masterpassword-mac.zip), [📲 Android](https://masterpassword.app/masterpassword-android.apk), [🖥 Desktop](https://masterpassword.app/masterpassword-gui.jar), and [⌨ Console](https://masterpassword.app/masterpassword-cli.tar.gz). Master Password is also available from the following package managers: [macOS: Homebrew](https://brew.sh/) (`brew install mpw`). Get in touch if you are interested in adding Master Password to any other package managers. @@ -90,7 +90,7 @@ Master Password is *not* a password manager. It does not store your website pas ## How does it work? -The details of how Master Password works [are available here](https://masterpasswordapp.com/masterpassword-algorithm.pdf). +The details of how Master Password works [are available here](https://masterpassword.app/masterpassword-algorithm.pdf). In short: @@ -136,7 +136,7 @@ Please don't hesitate to [get in touch](#support), we're more than happy to answ # Source Code -Master Password's algorithm is [documented](https://masterpasswordapp.com/masterpassword-algorithm.pdf) and its implementation is [Free Software (GPLv3)](LICENSE). +Master Password's algorithm is [documented](https://masterpassword.app/masterpassword-algorithm.pdf) and its implementation is [Free Software (GPLv3)](LICENSE). diff --git a/gradle/homebrew-mpw.rb b/gradle/homebrew-mpw.rb index cdded4be..15663247 100644 --- a/gradle/homebrew-mpw.rb +++ b/gradle/homebrew-mpw.rb @@ -1,31 +1,39 @@ class Mpw < Formula - homepage "http://masterpasswordapp.com" - url "https://ssl.masterpasswordapp.com/mpw-2.1-cli4-0-gf6b2287.tar.gz" - sha1 "036b3d8f4bd6f0676ae16e7e9c3de65f6030874f" - version "2.1-cli4" + desc "Stateless/deterministic password and identity manager" + homepage "https://masterpassword.app/" + url "https://masterpassword.app/mpw-2.6-cli-5-0-g344771db.tar.gz" + version "2.6-cli-5" + sha256 "954c07b1713ecc2b30a07bead9c11e6204dd774ca67b5bdf7d2d6ad1c4eec170" + head "https://github.com/Lyndir/MasterPassword.git" - depends_on "automake" => :build - depends_on "autoconf" => :build - depends_on "openssl" - - resource "libscrypt" do - url "http://masterpasswordapp.com/libscrypt-b12b554.tar.gz" - sha1 "ee871e0f93a786c4e3622561f34565337cfdb815" + bottle do + cellar :any + sha256 "ae8b265936797778a7cde788377eed89d9eacd267755a0b1186790057a10ff3b" => :high_sierra + sha256 "b8a106c3c84ff939e928613d4a6ccf7b5234e40ebae1edf15e3cac52d8c2e5ea" => :sierra + sha256 "9b58425b028a2598932474e1d0c17c13aad57e0a53ae7308c1b38404da8f3331" => :el_capitan end + option "without-json-c", "Disable JSON configuration support" + option "without-ncurses", "Disable colorized identicon support" + + depends_on "libsodium" + depends_on "json-c" => :recommended + depends_on "ncurses" => :recommended + def install - resource("libscrypt").stage buildpath/"lib/scrypt" - touch "lib/scrypt/.unpacked" + cd "platform-independent/cli-c" if build.head? + + ENV["targets"] = "mpw" + ENV["mpw_json"] = build.with?("json-c") ? "1" : "0" + ENV["mpw_color"] = build.with?("ncurses") ? "1" : "0" - ENV["targets"] = "mpw mpw-tests" system "./build" - system "./mpw-tests" - + system "./mpw-cli-tests" bin.install "mpw" end test do assert_equal "Jejr5[RepuSosp", - shell_output("mpw -u 'Robert Lee Mitchell' -P 'banana colored duckling' masterpasswordapp.com").strip + shell_output("#{bin}/mpw -q -Fnone -u 'Robert Lee Mitchell' -M 'banana colored duckling' -tlong -c1 -a3 'masterpasswordapp.com'").strip end end diff --git a/platform-darwin/Source/Mac/MPInitialWindowController.m b/platform-darwin/Source/Mac/MPInitialWindowController.m index 8b3d84a8..10e4609d 100644 --- a/platform-darwin/Source/Mac/MPInitialWindowController.m +++ b/platform-darwin/Source/Mac/MPInitialWindowController.m @@ -44,7 +44,7 @@ - (IBAction)androidPlayStore:(id)sender { - [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"http://masterpasswordapp.com"]]; + [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"https://masterpassword.app"]]; [self close]; } diff --git a/platform-darwin/Source/iOS/MPPreferencesViewController.m b/platform-darwin/Source/iOS/MPPreferencesViewController.m index f13e520e..e0c37b22 100644 --- a/platform-darwin/Source/iOS/MPPreferencesViewController.m +++ b/platform-darwin/Source/iOS/MPPreferencesViewController.m @@ -207,13 +207,13 @@ - (IBAction)homePageButton:(id)sender { [[self dismissPopup].navigationController performSegueWithIdentifier:@"web" sender: - [NSURL URLWithString:@"https://masterpasswordapp.com"]]; + [NSURL URLWithString:@"https://masterpassword.app"]]; } - (IBAction)securityButton:(id)sender { [[self dismissPopup].navigationController performSegueWithIdentifier:@"web" sender: - [NSURL URLWithString:@"https://masterpasswordapp.com/security.html"]]; + [NSURL URLWithString:@"https://masterpassword.app/security.html"]]; } - (IBAction)sourceButton:(id)sender { diff --git a/platform-darwin/Source/iOS/MPWebViewController.m b/platform-darwin/Source/iOS/MPWebViewController.m index 70fa4cec..f2e702f2 100644 --- a/platform-darwin/Source/iOS/MPWebViewController.m +++ b/platform-darwin/Source/iOS/MPWebViewController.m @@ -32,7 +32,7 @@ [super viewWillAppear:animated]; if (!self.initialURL) - self.initialURL = [NSURL URLWithString:@"https://masterpasswordapp.com"]; + self.initialURL = [NSURL URLWithString:@"https://masterpassword.app"]; self.webNavigationItem.title = self.initialURL.host; diff --git a/platform-darwin/Source/iOS/Storyboard.storyboard b/platform-darwin/Source/iOS/Storyboard.storyboard index c653d9cd..894e18f5 100644 --- a/platform-darwin/Source/iOS/Storyboard.storyboard +++ b/platform-darwin/Source/iOS/Storyboard.storyboard @@ -489,7 +489,7 @@ - + @@ -2487,11 +2487,11 @@ See - + - + diff --git a/platform-independent/cli-c/cli/mpw-bench.c b/platform-independent/cli-c/cli/mpw-bench.c index 0ddf155f..a88c97ea 100644 --- a/platform-independent/cli-c/cli/mpw-bench.c +++ b/platform-independent/cli-c/cli/mpw-bench.c @@ -66,7 +66,7 @@ int main(int argc, char *const argv[]) { const char *fullName = "Robert Lee Mitchel"; const char *masterPassword = "banana colored duckling"; - const char *siteName = "masterpasswordapp.com"; + const char *siteName = "masterpassword.app"; const MPCounterValue siteCounter = MPCounterValueDefault; const MPResultType resultType = MPResultTypeDefault; const MPKeyPurpose keyPurpose = MPKeyPurposeAuthentication; diff --git a/platform-independent/cli-c/cli/mpw-cli.c b/platform-independent/cli-c/cli/mpw-cli.c index 10ce2c30..e66a8020 100644 --- a/platform-independent/cli-c/cli/mpw-cli.c +++ b/platform-independent/cli-c/cli/mpw-cli.c @@ -36,7 +36,7 @@ static void usage() { inf( "" " Master Password v%s - CLI\n" "--------------------------------------------------------------------------------\n" - " https://masterpasswordapp.com\n", stringify_def( MP_VERSION ) ); + " https://masterpassword.app\n", stringify_def( MP_VERSION ) ); inf( "" "\nUSAGE\n\n" " mpw [-u|-U full-name] [-m fd] [-t pw-type] [-P value] [-c counter]\n" diff --git a/platform-independent/cli-c/cli/mpw-tests.c b/platform-independent/cli-c/cli/mpw-tests.c index 140c377b..6dbda3bc 100644 --- a/platform-independent/cli-c/cli/mpw-tests.c +++ b/platform-independent/cli-c/cli/mpw-tests.c @@ -43,7 +43,7 @@ static void usage() { inf( "" " Master Password v%s - Tests\n" "--------------------------------------------------------------------------------\n" - " https://masterpasswordapp.com\n", stringify_def( MP_VERSION ) ); + " https://masterpassword.app\n", stringify_def( MP_VERSION ) ); inf( "" "\nUSAGE\n\n" " mpw-tests [-v|-q]* [-h] [test-name ...]\n" ); diff --git a/platform-independent/cli-c/distribute b/platform-independent/cli-c/distribute index 9a981526..d09e5e17 100755 --- a/platform-independent/cli-c/distribute +++ b/platform-independent/cli-c/distribute @@ -32,4 +32,4 @@ echo echo "Done. Ready to publish the site." echo " package: $mpwArchive" echo " signature: $mpwArchive.sig" -echo " url: https://masterpasswordapp.com/$mpwArchive" +echo " url: https://masterpassword.app/$mpwArchive" diff --git a/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/GUI.java b/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/GUI.java index 23ab067a..9a8aefc4 100644 --- a/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/GUI.java +++ b/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/GUI.java @@ -86,7 +86,7 @@ public class GUI implements UnlockFrame.SignInCallback { continue; String manifestRevision = attributes.getValue( Attributes.Name.IMPLEMENTATION_VERSION ); - String upstreamRevisionURL = "https://masterpasswordapp.com/masterpassword-gui.jar.rev"; + String upstreamRevisionURL = "https://masterpassword.app/masterpassword-gui.jar.rev"; CharSource upstream = Resources.asCharSource( URI.create( upstreamRevisionURL ).toURL(), Charsets.UTF_8 ); String upstreamRevision = upstream.readFirstLine(); if ((manifestRevision != null) && (upstreamRevision != null) && !manifestRevision.equalsIgnoreCase( @@ -94,11 +94,11 @@ public class GUI implements UnlockFrame.SignInCallback { logger.inf( "Local Revision: <%s>", manifestRevision ); logger.inf( "Upstream Revision: <%s>", upstreamRevision ); logger.wrn( "You are not running the current official version. Please update from:%n%s", - "https://masterpasswordapp.com/masterpassword-gui.jar" ); + "https://masterpassword.app/masterpassword-gui.jar" ); JOptionPane.showMessageDialog( null, strf( "A new version of Master Password is available.%n " + "Please download the latest version from %s", - "https://masterpasswordapp.com" ), + "https://masterpassword.app" ), "Update Available", JOptionPane.WARNING_MESSAGE ); } } diff --git a/platform-independent/web-js/index.html b/platform-independent/web-js/index.html index a85c1369..8da2da59 100644 --- a/platform-independent/web-js/index.html +++ b/platform-independent/web-js/index.html @@ -56,8 +56,8 @@ diff --git a/platform-independent/web-js/sync b/platform-independent/web-js/sync index fadae750..7d00f1ba 100755 --- a/platform-independent/web-js/sync +++ b/platform-independent/web-js/sync @@ -2,5 +2,5 @@ set -e cd "${BASH_SOURCE[0]%/*}" -#s3cmd sync --exclude '.git/**' --delete-removed --follow-symlinks --preserve --acl-public --reduced-redundancy . s3://js.masterpasswordapp.com/ -rsync -avP --delete --no-group . satura.lyndir.com:/usr/local/www/js.masterpasswordapp.com/htdocs-secure/ +#s3cmd sync --exclude '.git/**' --delete-removed --follow-symlinks --preserve --acl-public --reduced-redundancy . s3://js.masterpassword.app/ +rsync -avP --delete --no-group . satura.lyndir.com:/usr/local/www/js.masterpassword.app/htdocs-secure/