Release 2.4.0

- New Database Wizard [#1952]
- Advanced Search [#1797]
- Automatic update checker [#2648]
- KeeShare database synchronization [#2109, #1992, #2738, #2742, #2746, #2739]
- Improve favicon fetching; transition to Duck-Duck-Go [#2795, #2011, #2439]
- Remove KeePassHttp support [#1752]
- CLI: output info to stderr for easier scripting [#2558]
- CLI: Add --quiet option [#2507]
- CLI: Add create command [#2540]
- CLI: Add recursive listing of entries [#2345]
- CLI: Fix stdin/stdout encoding on Windows [#2425]
- SSH Agent: Support OpenSSH for Windows [#1994]
- macOS: TouchID Quick Unlock [#1851]
- macOS: Multiple improvements; include CLI in DMG [#2165, #2331, #2583]
- Linux: Prevent Klipper from storing secrets in clipboard [#1969]
- Linux: Use polling based file watching for NFS [#2171]
- Linux: Enable use of browser plugin in Snap build [#2802]
- TOTP QR Code Generator [#1167]
- High-DPI Scaling for 4k screens [#2404]
- Make keyboard shortcuts more consistent [#2431]
- Warn user if deleting referenced entries [#1744]
- Allow toolbar to be hidden and repositioned [#1819, #2357]
- Increase max allowed database timeout to 12 hours [#2173]
- Password generator uses existing password length by default [#2318]
- Improve alert message box button labels [#2376]
- Show message when a database merge makes no changes [#2551]
- Browser Integration Enhancements [#1497, #2253, #1904, #2232, #1850, #2218, #2391, #2396, #2542, #2622, #2637, #2790]
- Overall Code Improvements [#2316, #2284, #2351, #2402, #2410, #2419, #2422, #2443, #2491, #2506, #2610, #2667, #2709, #2731]

.clang-format

@@ -30,7 +30,7 @@ BraceWrapping:
   BeforeCatch:     false
   BeforeElse:      false
   IndentBraces:    false
-BreakBeforeBinaryOperators: None
+BreakBeforeBinaryOperators: NonAssignment
 BreakBeforeBraces: Custom
 BreakBeforeTernaryOperators: true
 BreakConstructorInitializersBeforeComma: true

.github/CONTRIBUTING.md

@@ -94,7 +94,7 @@ The Branch Strategy is based on [git-flow-lite](http://nvie.com/posts/a-successf
 * **master** – points to the latest public release
 * **develop** – points to the development of the next release, contains tested and reviewed code
 * **feature/**[name] – points to a branch with a new feature, one which is candidate for merge into develop (subject to rebase)
-* **hotfix/**[id]-[description] – points to a branch with a fix for a particular issue ID
+* **hotfix/**[name] – points to a branch with a fix for a particular issue ID
 
 
 ### Git commit messages
@@ -103,14 +103,16 @@ The Branch Strategy is based on [git-flow-lite](http://nvie.com/posts/a-successf
 * Use the imperative mood ("Move cursor to…" not "Moves cursor to…")
 * Limit the first line to 72 characters or less
 * Reference issues and pull requests liberally
-* If your pull request fixes an existing issue, add "…, resolves #ISSUENUMBER" to your main commit
+* If your pull request fixes an existing issue, add "Fixes #ISSUENUMBER" to your pull request description
-* When only changing documentation, include `[ci skip]` in the commit description
 
 ### Coding styleguide
 
-This project follows the [Qt Coding Style](https://wiki.qt.io/Qt_Coding_Style). All submissions are expected to follow this style.
+The coding style of the project is enforced using llvm's `clang-format` formatting tool. A thorough description
+of the coding style can be found in the `.clang-format` file, but the main conventions are presented here.
 
-In particular, code must stick to the following rules:
+Formatting can be performed automatically by calling `make format` from the `build/` directory.
+
+Note that [formatting can be disabled on a piece of code](https://clang.llvm.org/docs/ClangFormatStyleOptions.html#disabling-formatting-on-a-piece-of-code) if manual formatting is deemed more readable.
 
 #### Naming convention
 `lowerCamelCase`
@@ -122,15 +124,67 @@ For names made of multiple concatenated words, the first letter of the whole is
 For **C++ files** (*.cpp .h*): 4 spaces  
 For **Qt-UI files** (*.ui*): 2 spaces
 
-#### Pointers
+#### Includes
+```c
+// Class includes
+#include "MyWidget.h"
+#include "ui_MyWidget.h"
+
+// Application includes
+#include "core/Config.h"
+#include "core/FilePath.h"
+
+// Global includes
+#include <QWidget>
+#include <stdin>
+```
+
+#### Classes
+```c
+// Note: order is important, stay organized!
+class MyWidget : public QWidget
+{
+    Q_OBJECT
+
+public:
+    explicit MyWidget(QWidget* parent);
+    ~MyWidget() override;
+
+signals:
+    void alert();
+
+public slots:
+    void processEvent(Event* event);
+
+private slots:
+    void myEvent(Event* event);
+
+private:
+    const QScopedPointer<Ui::MyWidget> m_ui;
+    int m_counter;
+};
+
+// Note: alignment of variable initialization
+MyWidget::MyWidget(QWidget* parent)
+    : QWidget(parent)
+    , m_ui(new Ui::MyWidget())
+{
+
+}
+```
+
+#### Pointers / References
 ```c
 int* count;
+const QString& string;
 ```
 
 #### Braces
 ```c
 if (condition) {
     doSomething();
+} else {
+    doSomethingElse();
 }
 
 void ExampleClass::exampleFunction()
@@ -141,15 +195,18 @@ void ExampleClass::exampleFunction()
 
 #### Switch statement
 ```c
+// Note: avoid declaring variables in a switch statement
 switch (a) {
 case 1:
     doSomething();
     break;
 
-default:
+// Note: use braces if necessary
+default: {
     doSomethingElse();
     break;
 }
+}
 ```
 
 #### Member variables

.github/ISSUE_TEMPLATE.md

@@ -1,40 +0,0 @@
-<!--- Provide a general summary of the issue in the title above -->
-
-## Expected Behavior
-<!--- If you're describing a bug, tell us what should happen -->
-<!--- If you're suggesting a change/improvement, tell us how it should work -->
-
-## Current Behavior
-<!--- If describing a bug, tell us what happens instead of the expected behavior -->
-<!--- If suggesting a change/improvement, explain the difference from the current behavior -->
-
-## Possible Solution
-<!--- Not obligatory, but suggest a fix/reason for the bug, -->
-<!--- or ideas how to implement the addition or change -->
-
-## Steps to Reproduce (for bugs)
-<!--- Provide a link to a live example, or an unambiguous set of steps to -->
-<!--- reproduce this bug. Include code to reproduce, if relevant -->
-1.
-2.
-3.
-4.
-
-## Context
-<!--- How has this issue affected you? What are you trying to accomplish? -->
-<!--- Providing context helps us come up with a solution that is most useful in the real world -->
-
-## Debug Info
-<!--- Paste debug info from Help → About here -->
-KeePassXC - VERSION
-Revision: REVISION
-
-Libraries:
-- LIBS
-
-Operating system: OS
-CPU architecture: ARCH
-Kernel: KERNEL
-
-Enabled extensions:
-- EXTENSIONS

.github/ISSUE_TEMPLATE/bug-report.md

@@ -0,0 +1,49 @@
+---
+name: Bug Report
+about: provide information about a problem
+title: 
+labels: bug
+assignees: ''
+
+---
+
+[TIP]:  # ( Provide a general summary of the issue in the title above ^^ )
+[TIP]:  # ( DO NOT include screenshots of your actual database! )
+
+## Expected Behavior
+[NOTE]: # ( Tell us what you expected to happen )
+
+
+## Current Behavior
+[NOTE]: # ( Tell us what actually happens )
+
+
+## Possible Solution
+[NOTE]: # ( Not required, but suggest a fix/reason for the bug )
+
+
+## Steps to Reproduce
+[NOTE]: # ( Provide a link to a live example, or an unambiguous set of steps to )
+[NOTE]: # ( reproduce this bug. Include code to reproduce, if relevant )
+1.
+2.
+3.
+
+## Context
+[NOTE]: # ( How has this issue affected you? What unique circumstances do you have? )
+
+
+## Debug Info
+[NOTE]: # ( Paste debug info from Help → About here )
+KeePassXC - VERSION
+Revision: REVISION
+
+Libraries:
+- LIBS
+
+Operating system: OS
+CPU architecture: ARCH
+Kernel: KERNEL
+
+Enabled extensions:
+- EXTENSIONS

.github/ISSUE_TEMPLATE/feature-request.md

@@ -0,0 +1,26 @@
+---
+name: Feature Request
+about: tell us about a new capability you want to see
+title: 
+labels: new feature
+assignees: ''
+
+---
+
+[TIP]:  # ( Provide a general summary of the feature in the title above ^^ )
+[TIP]:  # ( DO NOT include screenshots of your actual database! )
+
+## Summary
+[NOTE]: # ( Provide a brief overview of what the new feature is all about )
+
+
+## Desired Behavior
+[NOTE]: # ( Tell us how the new feature should work, be specific )
+
+
+## Possible Solution
+[NOTE]: # ( Not required, but suggest ideas on how to implement the addition or change )
+
+
+## Context
+[NOTE]: # ( Why does this feature matter to you? What unique circumstances do you have? )

.github/ISSUE_TEMPLATE/release-preview-bug-report.md

@@ -0,0 +1,49 @@
+---
+name: Release Preview Bug report
+about: report a bug with a release preview (eg, 2.4.0-beta1)
+title: "[PRE-RELEASE] "
+labels: PRE-RELEASE BUG
+assignees: droidmonkey
+
+---
+
+[TIP]:  # ( Provide a general summary of the issue in the title above ^^ )
+[TIP]:  # ( DO NOT include screenshots of your actual database! )
+
+## Expected Behavior
+[NOTE]: # ( Tell us what you expected to happen )
+
+
+## Current Behavior
+[NOTE]: # ( Tell us what actually happens )
+
+
+## Possible Solution
+[NOTE]: # ( Not required, but suggest a fix/reason for the bug )
+
+
+## Steps to Reproduce
+[NOTE]: # ( Provide a link to a live example, or an unambiguous set of steps to )
+[NOTE]: # ( reproduce this bug. Include code to reproduce, if relevant )
+1.
+2.
+3.
+
+## Context
+[NOTE]: # ( How has this issue affected you? What unique circumstances do you have? )
+
+
+## Debug Info
+[NOTE]: # ( Paste debug info from Help → About here )
+KeePassXC - VERSION
+Revision: REVISION
+
+Libraries:
+- LIBS
+
+Operating system: OS
+CPU architecture: ARCH
+Kernel: KERNEL
+
+Enabled extensions:
+- EXTENSIONS

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,34 +1,36 @@
-<!--- Provide a general summary of your changes in the title above -->
+[TIP]:  # ( Provide a general summary of your changes in the title above ^^ )
 
-## Description
+## Type of change
-<!--- Describe your changes in detail -->
+[NOTE]: # ( Please remove all lines which don't apply. )
-
-## Motivation and context
-<!--- Why is this change required? What problem does it solve? -->
-<!--- If it fixes an open issue, please link to the issue here. -->
-
-## How has this been tested?
-<!--- Please describe in detail how you tested your changes. -->
-<!--- Include details of your testing environment, and the tests you ran to -->
-<!--- see how your change affects other areas of the code, etc. -->
-
-## Screenshots (if appropriate):
-
-## Types of changes
-<!--- What types of changes does your code introduce? -->
-<!--- Please remove all lines which don't apply. -->
 - ✅ Bug fix (non-breaking change which fixes an issue)
+- ✅ Refactor (significant modification to existing code)
 - ✅ New feature (non-breaking change which adds functionality)
 - ✅ Breaking change (fix or feature that would cause existing functionality to change)
+- ✅ Documentation (non-code change)
+
+## Description and Context
+[NOTE]: # ( Describe your changes in detail, why is this change required? )
+[NOTE]: # ( Describe the context of your change. Explain large code modifications. )
+[NOTE]: # ( If it fixes an open issue, please add "Fixes #XXX" as necessary )
+
+
+## Screenshots
+[TIP]:  # ( Do not include screenshots of your actual database! )
+
+
+## Testing strategy
+[NOTE]: # ( Please describe in detail how you tested your changes. )
+[TIP]:  # ( We expect new code to be covered by unit tests and documented with doc blocks! )
+
 
 ## Checklist:
-<!--- Please go over all the following points. -->
+[NOTE]: # ( Please go over all the following points. )
-<!--- Again, remove any lines which don't apply. -->
+[NOTE]: # ( Again, remove any lines which don't apply. )
-<!--- Pull Requests that don't fulfill all [REQUIRED] requisites are likely -->
+[NOTE]: # ( Pull Requests that don't fulfill all [REQUIRED] requisites are likely )
-<!--- to be sent back to you for correction or will be rejected.  -->
+[NOTE]: # ( to be sent back to you for correction or will be rejected.  )
 - ✅ I have read the **CONTRIBUTING** document. **[REQUIRED]**
 - ✅ My code follows the code style of this project. **[REQUIRED]**
 - ✅ All new and existing tests passed. **[REQUIRED]**
 - ✅ I have compiled and verified my code with `-DWITH_ASAN=ON`. **[REQUIRED]**
-- ✅ My change requires a change to the documentation and I have updated it accordingly.
+- ✅ My change requires a change to the documentation, and I have updated it accordingly.
 - ✅ I have added tests to cover my changes.

.gitignore

@@ -11,4 +11,13 @@ release*/
 
 .DS_Store
 .version
+desktop.ini
 \.scannerwork/
+
+/snap/.snapcraft/
+/parts/
+/stage/
+/prime/
+/*.snap
+/*_source.tar.bz2
+

.tx/config

@@ -1,7 +1,7 @@
 [main]
 host = https://www.transifex.com
 
-[keepassxc.keepassx_ents]
+[keepassxc.keepassxc]
 source_file = share/translations/keepassx_en.ts
 file_filter = share/translations/keepassx_<lang>.ts
 source_lang = en

AppImage-Recipe.sh

@@ -1,114 +0,0 @@
-#!/usr/bin/env bash
-# 
-# KeePassXC AppImage Recipe
-# Copyright (C) 2017-2018 KeePassXC team <https://keepassxc.org/>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 or (at your option)
-# version 3 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-if [ "$1" == "" ] || [ "$2" == "" ]; then
-    echo "Usage: $(basename $0) APP_NAME RELEASE_VERSION" >&2
-    exit 1
-fi
-
-if [ -f CHANGELOG ]; then
-    echo "This recipe must not be run from the sources root." >&2
-    exit 1
-fi
-
-if [ ! -d ../bin-release ]; then
-    echo "../bin-release does not exist." >&2
-    exit 1
-fi
-
-APP="$1"
-LOWERAPP="$(echo "$APP" | tr '[:upper:]' '[:lower:]')"
-VERSION="$2"
-export ARCH=x86_64
-
-mkdir -p $APP.AppDir
-wget -q https://github.com/AppImage/AppImages/raw/master/functions.sh -O ./functions.sh
-. ./functions.sh
-
-LIB_DIR=./usr/lib
-if [ -d ./usr/lib/x86_64-linux-gnu ]; then
-    LIB_DIR=./usr/lib/x86_64-linux-gnu
-elif [ -d ./usr/lib/i386-linux-gnu ]; then
-    LIB_DIR=./usr/lib/i386-linux-gnu
-elif [ -d ./usr/lib64 ]; then
-    LIB_DIR=./usr/lib64
-fi
-
-cd $APP.AppDir
-cp -a ../../bin-release/* .
-cp -a ./usr/local/* ./usr
-rm -R ./usr/local
-rmdir ./opt 2> /dev/null
-
-# bundle Qt platform plugins and themes
-QXCB_PLUGIN="$(find /usr/lib* -name 'libqxcb.so' 2> /dev/null)"
-if [ "$QXCB_PLUGIN" == "" ]; then
-    QXCB_PLUGIN="$(find /opt/qt*/plugins -name 'libqxcb.so' 2> /dev/null)"
-fi
-QT_PLUGIN_PATH="$(dirname $(dirname $QXCB_PLUGIN))"
-mkdir -p ".${QT_PLUGIN_PATH}/platforms"
-cp -a "$QXCB_PLUGIN" ".${QT_PLUGIN_PATH}/platforms/"
-cp -a "${QT_PLUGIN_PATH}/platforminputcontexts/" ".${QT_PLUGIN_PATH}/platforminputcontexts/"
-cp -a "${QT_PLUGIN_PATH}/imageformats/" ".${QT_PLUGIN_PATH}/imageformats/"
-
-get_apprun
-copy_deps
-
-# protect our libgpg-error from being deleted
-mv ./opt/keepassxc-libs/lib/x86_64-linux-gnu/libgpg-error.so.0 ./protected.so
-delete_blacklisted
-mv ./protected.so ./opt/keepassxc-libs/lib/x86_64-linux-gnu/libgpg-error.so.0
-
-get_desktop
-get_icon
-cat << EOF > ./usr/bin/keepassxc_env
-#!/usr/bin/env bash
-export LD_LIBRARY_PATH="..$(dirname ${QT_PLUGIN_PATH})/lib:\${LD_LIBRARY_PATH}"
-export LD_LIBRARY_PATH="../opt/keepassxc-libs/lib/x86_64-linux-gnu:\${LD_LIBRARY_PATH}"
-
-export QT_PLUGIN_PATH="..${QT_PLUGIN_PATH}:\${KPXC_QT_PLUGIN_PATH}"
-
-# unset XDG_DATA_DIRS to make tray icon work in Ubuntu Unity
-# see https://github.com/AppImage/AppImageKit/issues/351
-unset XDG_DATA_DIRS
-
-if [ "\${1}" == "cli" ]; then
-    shift
-    exec keepassxc-cli "\$@"
-elif [ "\${1}" == "proxy" ]; then
-    shift
-    exec keepassxc-proxy "\$@"
-elif [ -v CHROME_WRAPPER ] || [ -v MOZ_LAUNCHED_CHILD ]; then
-    exec keepassxc-proxy "\$@"
-else
-    exec keepassxc "\$@"
-fi
-EOF
-chmod +x ./usr/bin/keepassxc_env
-sed -i 's/Exec=keepassxc/Exec=keepassxc_env/' org.${LOWERAPP}.${APP}.desktop
-get_desktopintegration "org.${LOWERAPP}.${APP}"
-
-cd ..
-
-GLIBC_NEEDED=$(glibc_needed)
-NO_GLIBC_VERSION=true
-
-generate_type2_appimage -u "gh-releases-zsync|keepassxreboot|keepassxc|latest|KeePassXC-*-${ARCH}.AppImage.zsync"
-
-mv ../out/*.AppImage* ../
-rm -rf ../out

CHANGELOG

@@ -1,3 +1,35 @@
+2.4.0 (2019-03-19)
+=========================
+
+- New Database Wizard [#1952]
+- Advanced Search [#1797]
+- Automatic update checker [#2648]
+- KeeShare database synchronization [#2109, #1992, #2738, #2742, #2746, #2739]
+- Improve favicon fetching; transition to Duck-Duck-Go [#2795, #2011, #2439]
+- Remove KeePassHttp support [#1752]
+- CLI: output info to stderr for easier scripting [#2558]
+- CLI: Add --quiet option [#2507]
+- CLI: Add create command [#2540]
+- CLI: Add recursive listing of entries [#2345]
+- CLI: Fix stdin/stdout encoding on Windows [#2425]
+- SSH Agent: Support OpenSSH for Windows [#1994]
+- macOS: TouchID Quick Unlock [#1851]
+- macOS: Multiple improvements; include CLI in DMG [#2165, #2331, #2583]
+- Linux: Prevent Klipper from storing secrets in clipboard [#1969]
+- Linux: Use polling based file watching for NFS [#2171]
+- Linux: Enable use of browser plugin in Snap build [#2802]
+- TOTP QR Code Generator [#1167]
+- High-DPI Scaling for 4k screens [#2404]
+- Make keyboard shortcuts more consistent [#2431]
+- Warn user if deleting referenced entries [#1744]
+- Allow toolbar to be hidden and repositioned [#1819, #2357]
+- Increase max allowed database timeout to 12 hours [#2173]
+- Password generator uses existing password length by default [#2318]
+- Improve alert message box button labels [#2376]
+- Show message when a database merge makes no changes [#2551]
+- Browser Integration Enhancements [#1497, #2253, #1904, #2232, #1850, #2218, #2391, #2396, #2542, #2622, #2637, #2790]
+- Overall Code Improvements [#2316, #2284, #2351, #2402, #2410, #2419, #2422, #2443, #2491, #2506, #2610, #2667, #2709, #2731]
+
 2.3.4 (2018-08-21)
 =========================
 

CMakeLists.txt

@@ -1,4 +1,4 @@
-#  Copyright (C) 2017 KeePassXC Team <team@keepassxc.org>
+#  Copyright (C) 2018 KeePassXC Team <team@keepassxc.org>
 #  Copyright (C) 2010 Felix Geyer <debfx@fobos.de>
 #
 #  This program is free software: you can redistribute it and/or modify
@@ -45,14 +45,12 @@ set(WITH_XC_ALL OFF CACHE BOOLEAN "Build in all available plugins")
 option(WITH_XC_AUTOTYPE "Include Auto-Type." ON)
 option(WITH_XC_NETWORKING "Include networking code (e.g. for downlading website icons)." OFF)
 option(WITH_XC_BROWSER "Include browser integration with keepassxc-browser." OFF)
-option(WITH_XC_HTTP "Include KeePassHTTP-compatible browser integration (deprecated, implies WITH_NETWORKING)." OFF)
 option(WITH_XC_YUBIKEY "Include YubiKey support." OFF)
 option(WITH_XC_SSHAGENT "Include SSH agent support." OFF)
-
+option(WITH_XC_KEESHARE "Sharing integration with KeeShare" OFF)
-if(WITH_XC_HTTP)
+option(WITH_XC_KEESHARE_SECURE "Sharing integration with secured KeeShare containers" OFF)
-  message(WARNING "KeePassHTTP support has been deprecated and will be removed in a future version. Please use WITH_XC_BROWSER instead!\n"
+if(APPLE)
-          "For enabling / disabling network access code, WITH_XC_HTTP has been replaced by WITH_XC_NETWORKING.")
+    option(WITH_XC_TOUCHID "Include TouchID support for macOS." OFF)
-  set(WITH_XC_NETWORKING ON CACHE BOOL "Include networking code (e.g. for downlading website icons)." FORCE)
 endif()
 
 if(WITH_XC_ALL)
@@ -60,27 +58,51 @@ if(WITH_XC_ALL)
     set(WITH_XC_AUTOTYPE ON)
     set(WITH_XC_NETWORKING ON)
     set(WITH_XC_BROWSER ON)
-  set(WITH_XC_HTTP ON) # Deprecated
     set(WITH_XC_YUBIKEY ON)
     set(WITH_XC_SSHAGENT ON)
+    set(WITH_XC_KEESHARE ON)
+    if(APPLE)
+        set(WITH_XC_TOUCHID ON)
+    endif()
 endif()
 
-# Process ui files automatically from source files
+if(WITH_XC_KEESHARE_SECURE)
-set(CMAKE_AUTOUIC ON)
+    set(WITH_XC_KEESHARE ON)
+endif()
+
+if(WITH_XC_SSHAGENT OR WITH_XC_KEESHARE)
+  set(WITH_XC_CRYPTO_SSH ON)
+else()
+  set(WITH_XC_CRYPTO_SSH OFF)
+endif()
 
 set(KEEPASSXC_VERSION_MAJOR "2")
-set(KEEPASSXC_VERSION_MINOR "3")
+set(KEEPASSXC_VERSION_MINOR "4")
-set(KEEPASSXC_VERSION_PATCH "4")
+set(KEEPASSXC_VERSION_PATCH "0")
 set(KEEPASSXC_VERSION "${KEEPASSXC_VERSION_MAJOR}.${KEEPASSXC_VERSION_MINOR}.${KEEPASSXC_VERSION_PATCH}")
 
 set(KEEPASSXC_BUILD_TYPE "Snapshot" CACHE STRING "Set KeePassXC build type to distinguish between stable releases and snapshots")
 set_property(CACHE KEEPASSXC_BUILD_TYPE PROPERTY STRINGS Snapshot Release PreRelease)
 
+# Retrieve git HEAD revision hash
+set(GIT_HEAD_OVERRIDE "" CACHE STRING "Manually set the Git HEAD hash when missing (eg, when no .git folder exists)")
+execute_process(COMMAND git rev-parse --short=7 HEAD
+        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+        OUTPUT_VARIABLE GIT_HEAD
+        ERROR_QUIET)
+string(STRIP "${GIT_HEAD}" GIT_HEAD)
+if(GIT_HEAD STREQUAL "")
+    string(SUBSTRING "${GIT_HEAD_OVERRIDE}" 0 7 GIT_HEAD)
+endif()
+message(STATUS "Found Git HEAD Revision: ${GIT_HEAD}\n")
+
 # Check if on a tag, if so build as a release
 execute_process(COMMAND git tag --points-at HEAD
         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-        OUTPUT_VARIABLE GIT_TAG)
+        OUTPUT_VARIABLE GIT_TAG
+        ERROR_QUIET)
 if(GIT_TAG)
+    string(STRIP "${GIT_TAG}" GIT_TAG)
     set(OVERRIDE_VERSION ${GIT_TAG})
 elseif(EXISTS ${CMAKE_SOURCE_DIR}/.version)
     file(READ ${CMAKE_SOURCE_DIR}/.version OVERRIDE_VERSION)
@@ -209,12 +231,6 @@ endif()
 
 if(CMAKE_COMPILER_IS_GNUCXX)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wcast-align")
-
-  if(WITH_COVERAGE)
-    # Include code coverage, use with -DCMAKE_BUILD_TYPE=Coverage
-    include(CodeCoverage)
-    setup_target_for_coverage(kp_coverage "make test" coverage)
-  endif()
 endif()
 
 if(CMAKE_COMPILER_IS_GNUCC)
@@ -265,11 +281,6 @@ else()
     set(PROGNAME keepassxc)
 endif()
 
-if(APPLE AND WITH_APP_BUNDLE AND "${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr/local")
-  set(CMAKE_INSTALL_PREFIX "/Applications")
-  set(CMAKE_INSTALL_MANDIR "/usr/local/share/man")
-endif()
-
 if(MINGW)
     set(CLI_INSTALL_DIR ".")
     set(PROXY_INSTALL_DIR ".")
@@ -277,9 +288,10 @@ if(MINGW)
     set(PLUGIN_INSTALL_DIR ".")
     set(DATA_INSTALL_DIR "share")
 elseif(APPLE AND WITH_APP_BUNDLE)
-  set(CLI_INSTALL_DIR    "/usr/local/bin")
+    set(CMAKE_INSTALL_MANDIR "${PROGNAME}.app/Contents/Resources/man")
-  set(PROXY_INSTALL_DIR  "/usr/local/bin")
+    set(CLI_INSTALL_DIR "${PROGNAME}.app/Contents/MacOS")
-  set(BIN_INSTALL_DIR    ".")
+    set(PROXY_INSTALL_DIR "${PROGNAME}.app/Contents/MacOS")
+    set(BIN_INSTALL_DIR "${PROGNAME}.app/Contents/MacOS")
     set(PLUGIN_INSTALL_DIR "${PROGNAME}.app/Contents/PlugIns")
     set(DATA_INSTALL_DIR "${PROGNAME}.app/Contents/Resources")
 else()
@@ -296,17 +308,31 @@ if(WITH_TESTS)
     enable_testing()
 endif(WITH_TESTS)
 
+if(WITH_COVERAGE)
+    # Include code coverage, use with -DCMAKE_BUILD_TYPE=Debug
+    include(CodeCoverage)
+    set(COVERAGE_GCOVR_EXCLUDES
+            "\\(.+/\\)?tests/.\\*"
+            ".\\*/moc_\\[^/\\]+\\.cpp"
+            ".\\*/ui_\\[^/\\]+\\.h"
+            "\\(.+/\\)?zxcvbn/.\\*")
+    append_coverage_compiler_flags()
+    setup_target_for_coverage_gcovr_html(
+            NAME coverage
+            EXECUTABLE $(MAKE) && $(MAKE) test
+    )
+endif()
+
+include(CLangFormat)
+
+set(QT_COMPONENTS Core Network Concurrent Gui Svg Widgets Test LinguistTools)
 if(UNIX AND NOT APPLE)
-  find_package(Qt5 COMPONENTS Core Network Concurrent Widgets Test LinguistTools DBus REQUIRED)
+    find_package(Qt5 COMPONENTS ${QT_COMPONENTS} DBus REQUIRED)
 elseif(APPLE)
-  find_package(Qt5 COMPONENTS Core Network Concurrent Widgets Test LinguistTools REQUIRED
+    find_package(Qt5 COMPONENTS ${QT_COMPONENTS} REQUIRED HINTS /usr/local/opt/qt/lib/cmake /usr/local/Cellar/qt/*/lib/cmake ENV PATH)
-    HINTS /usr/local/Cellar/qt/*/lib/cmake ENV PATH
+    find_package(Qt5 COMPONENTS MacExtras HINTS /usr/local/opt/qt/lib/cmake /usr/local/Cellar/qt/*/lib/cmake ENV PATH)
-  )
-  find_package(Qt5 COMPONENTS MacExtras
-    HINTS /usr/local/Cellar/qt/*/lib/cmake ENV PATH
-  )
 else()
-  find_package(Qt5 COMPONENTS Core Network Concurrent Widgets Test LinguistTools REQUIRED)
+    find_package(Qt5 COMPONENTS ${QT_COMPONENTS} REQUIRED)
 endif()
 
 if(Qt5Core_VERSION VERSION_LESS "5.2.0")
@@ -315,8 +341,11 @@ endif()
 
 get_filename_component(Qt5_PREFIX ${Qt5_DIR}/../../.. REALPATH)
 
+# Process moc automatically
 set(CMAKE_AUTOMOC ON)
+# Process .ui files automatically
 set(CMAKE_AUTOUIC ON)
+# Process .qrc files automatically
 set(CMAKE_AUTORCC ON)
 
 if(APPLE)
@@ -336,8 +365,8 @@ set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_NONE QT_NO_DEBUG)
 find_package(LibGPGError REQUIRED)
 find_package(Gcrypt 1.7.0 REQUIRED)
 find_package(Argon2 REQUIRED)
-
 find_package(ZLIB REQUIRED)
+find_package(QREncode REQUIRED)
 
 set(CMAKE_REQUIRED_INCLUDES ${ZLIB_INCLUDE_DIR})
 
@@ -345,6 +374,21 @@ if(ZLIB_VERSION_STRING VERSION_LESS "1.2.0")
     message(FATAL_ERROR "zlib 1.2.0 or higher is required to use the gzip format")
 endif()
 
+include_directories(SYSTEM ${ARGON2_INCLUDE_DIR})
+
+# Optional
+if(WITH_XC_KEESHARE)
+    set(WITH_XC_KEESHARE_INSECURE ON)
+    if(WITH_XC_KEESHARE_SECURE)
+        # ZLIB is needed and already required
+        find_package(QuaZip REQUIRED)
+        include_directories(SYSTEM ${QUAZIP_INCLUDE_DIR})
+    endif()
+else()
+    set(WITH_XC_KEESHARE_INSECURE OFF)
+    set(WITH_XC_KEESHARE_SECURE OFF)
+endif()
+
 # Optional
 if(WITH_XC_YUBIKEY)
     find_package(YubiKey REQUIRED)

COPYING

@@ -56,15 +56,15 @@ Copyright: 2015 halex2005 <akharlov@gmail.com>
 License: MIT
 
 Files: share/icons/application/*/apps/keepassxc.png
-       share/icons/application/scalable/apps/keepassxc.svgz
+       share/icons/application/scalable/apps/keepassxc.svg
        share/icons/application/*/apps/keepassxc-dark.png
-       share/icons/application/scalable/apps/keepassxc-dark.svgz
+       share/icons/application/scalable/apps/keepassxc-dark.svg
        share/icons/application/*/apps/keepassxc-locked.png
-       share/icons/application/scalable/apps/keepassxc-locked.svgz
+       share/icons/application/scalable/apps/keepassxc-locked.svg
        share/icons/application/*/apps/keepassxc-unlocked.png
-       share/icons/application/scalable/apps/keepassxc-unlocked.svgz
+       share/icons/application/scalable/apps/keepassxc-unlocked.svg
        share/icons/application/*/mimetypes/application-x-keepassxc.png
-       share/icons/application/scalable/mimetypes/application-x-keepassxc.svgz
+       share/icons/application/scalable/mimetypes/application-x-keepassxc.svg
 Copyright: 2016, Lorenzo Stella <lorenzo.stl@gmail.com>
 License: LGPL-2
 
@@ -151,6 +151,12 @@ Copyright: 2003-2004, David Vignoni <david@icon-king.com>
 License: LGPL-2.1
 Comment: based on Nuvola icon theme
 
+Files: share/icons/application/*/actions/favicon-download.png
+Copyright: 2003-2004, David Vignoni <david@icon-king.com>
+           2018, Kyle Kneitinger <kyle@kneit.in>
+License: LGPL-2.1
+Comment: based on Nuvola icon theme
+
 Files: share/icons/application/*/actions/application-exit.png
        share/icons/application/*/actions/chronometer.png
        share/icons/application/*/actions/configure.png
@@ -181,7 +187,7 @@ Files: share/icons/application/*/actions/application-exit.png
        share/icons/application/*/status/dialog-information.png
        share/icons/application/*/status/dialog-warning.png
        share/icons/application/*/status/security-high.png
-       share/icons/svg/*.svgz
+       share/icons/svg/*.svg
 Copyright: 2007, Nuno Pinheiro <nuno@oxygen-icons.org>
            2007, David Vignoni <david@icon-king.com>
            2007, David Miller <miller@oxygen-icons.org>
@@ -226,10 +232,6 @@ Files: src/zxcvbn/zxcvbn.*
 Copyright: 2015-2017, Tony Evans
 License: MIT
 
-Files: src/http/qhttp/*
-Copyright: 2014, Amir Zamani
-License: MIT
-
 Files: src/gui/KMessageWidget.h
        src/gui/KMessageWidget.cpp
 Copyright: 2011 Aurélien Gâteau <agateau@kde.org>

Dockerfile

@@ -16,17 +16,18 @@
 
 FROM ubuntu:14.04
 
-ENV REBUILD_COUNTER=8
+ENV REBUILD_COUNTER=10
 
-ENV QT5_VERSION=59
+ENV QT5_VERSION=qt510
-ENV QT5_PPA_VERSION=${QT5_VERSION}4
+ENV QT5_PPA_VERSION=qt-5.10.1
+ENV TERM=xterm-256color
 
 RUN set -x \
     && apt-get update -y \
     && apt-get -y install software-properties-common
 
 RUN set -x \
-    && add-apt-repository ppa:beineri/opt-qt${QT5_PPA_VERSION}-trusty \
+    && add-apt-repository ppa:beineri/opt-${QT5_PPA_VERSION}-trusty \
     && add-apt-repository ppa:phoerious/keepassxc
 
 RUN set -x \
@@ -37,39 +38,55 @@ RUN set -x \
 RUN set -x \
     && apt-get install -y \
         cmake3 \
+        curl \
         g++ \
         git \
         libgcrypt20-18-dev \
         libargon2-0-dev \
         libsodium-dev \
         libcurl-no-gcrypt-dev \
-        qt${QT5_VERSION}base \
+        ${QT5_VERSION}base \
-        qt${QT5_VERSION}tools \
+        ${QT5_VERSION}tools \
-        qt${QT5_VERSION}x11extras \
+        ${QT5_VERSION}x11extras \
-        qt${QT5_VERSION}translations \
+        ${QT5_VERSION}translations \
-        qt${QT5_VERSION}imageformats \
+        ${QT5_VERSION}imageformats \
+        ${QT5_VERSION}svg \
         zlib1g-dev \
         libxi-dev \
         libxtst-dev \
+        # ubuntu:14.04 has no quazip (it's optional)
+        # libquazip5-dev \
         mesa-common-dev \
         libyubikey-dev \
-        libykpers-1-dev
+        libykpers-1-dev \
+        libqrencode-dev \
+        xclip \
+        xvfb
 
-ENV CMAKE_PREFIX_PATH="/opt/qt${QT5_VERSION}/lib/cmake"
+ENV PATH="/opt/${QT5_VERSION}/bin:${PATH}"
+ENV CMAKE_PREFIX_PATH="/opt/${QT5_VERSION}/lib/cmake"
 ENV CMAKE_INCLUDE_PATH="/opt/keepassxc-libs/include"
 ENV CMAKE_LIBRARY_PATH="/opt/keepassxc-libs/lib/x86_64-linux-gnu"
 ENV CPATH="${CMAKE_INCLUDE_PATH}"
-ENV LD_LIBRARY_PATH="${CMAKE_LIBRARY_PATH}:/opt/qt${QT5_VERSION}/lib"
+ENV LD_LIBRARY_PATH="${CMAKE_LIBRARY_PATH}:/opt/${QT5_VERSION}/lib"
 
 RUN set -x \
-    && echo "/opt/qt${QT5_VERSION}/lib" > /etc/ld.so.conf.d/qt${QT5_VERSION}.conf \
+    && echo "/opt/${QT5_VERSION}/lib" > /etc/ld.so.conf.d/${QT5_VERSION}.conf \
     && echo "/opt/keepassxc-libs/lib/x86_64-linux-gnu" > /etc/ld.so.conf.d/keepassxc.conf
 
 # AppImage dependencies
 RUN set -x \
     && apt-get install -y \
-        libfuse2 \
+        curl \
-        wget
+        libfuse2
+
+RUN set -x \
+    && curl -L "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage" > /usr/bin/linuxdeploy \
+    && curl -L "https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage" > /usr/bin/linuxdeploy-plugin-qt \
+    && curl -L "https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage" > /usr/bin/appimagetool \
+    && chmod +x /usr/bin/linuxdeploy \
+    && chmod +x /usr/bin/linuxdeploy-plugin-qt \
+    && chmod +x /usr/bin/appimagetool
 
 RUN set -x \
     && apt-get autoremove --purge \

INSTALL.md

@@ -28,7 +28,6 @@ The following libraries are required:
 * libsodium (>= 1.0.12, optional for KeePassXC-Browser support)
 * libargon2
 
-
 Prepare the Building Environment
 ================================
 
@@ -60,13 +59,19 @@ To update the project from within the project's folder, you can run the followin
 git pull
 ```
 
+For a stable build, it is recommended to checkout the master branch.
+
+```bash
+git checkout master
+```
+
 Navigate to the directory where you have downloaded KeePassXC and type these commands:
 
 ```
 cd directory-where-sources-live
 mkdir build
 cd build
-cmake -DWITH_TESTS=OFF ...and other options - see below...
+cmake -DWITH_XC_ALL=ON ..
 make
 ```
 
@@ -90,15 +95,20 @@ These steps place the compiled KeePassXC binary inside the `./build/src/` direct
 
 	```
 	  -DWITH_XC_AUTOTYPE=[ON|OFF] Enable/Disable Auto-Type (default: ON)
-	  -DWITH_XC_HTTP=[ON|OFF] Enable/Disable KeePassHTTP and custom icon downloads (default: OFF)
 	  -DWITH_XC_YUBIKEY=[ON|OFF] Enable/Disable YubiKey HMAC-SHA1 authentication support (default: OFF)
 	  -DWITH_XC_BROWSER=[ON|OFF] Enable/Disable KeePassXC-Browser extension support (default: OFF)
-
+	  -DWITH_XC_NETWORKING=[ON|OFF] Enable/Disable Networking support (favicon download) (default: OFF)
+	  -DWITH_XC_SSHAGENT=[ON|OFF] Enable/Disable SSHAgent support (default: OFF)
+	  -DWITH_XC_KEESHARE=[ON|OFF] Enable/Disable KeeShare group syncronization extension (default: OFF)
+	  -DWITH_XC_TOUCHID=[ON|OFF] (macOS Only) Enable/Disable Touch ID unlock (default:OFF)
+	  -DWITH_XC_ALL=[ON|OFF] Enable/Disable compiling all plugins above (default: OFF)
+	  -DWITH_XC_KEESHARE_SECURE=[ON|OFF] Enable/Disable KeeShare secure containers, requires libquazip5 (default: OFF)
 	  -DWITH_TESTS=[ON|OFF] Enable/Disable building of unit tests (default: ON)
 	  -DWITH_GUI_TESTS=[ON|OFF] Enable/Disable building of GUI tests (default: OFF)
 	  -DWITH_DEV_BUILD=[ON|OFF] Enable/Disable deprecated method warnings (default: OFF)
 	  -DWITH_ASAN=[ON|OFF] Enable/Disable address sanitizer checks (Linux / macOS only) (default: OFF)
 	  -DWITH_COVERAGE=[ON|OFF] Enable/Disable coverage tests (GCC only) (default: OFF)
+	  -DWITH_APP_BUNDLE=[ON|OFF] Enable Application Bundle for macOS (default: ON)
 	```
 
 * If you are on MacOS you must add this parameter to **Cmake**, with the Qt version you have installed<br/> `-DCMAKE_PREFIX_PATH=/usr/local/Cellar/qt5/5.6.2/lib/cmake/`

README.md

@@ -1,5 +1,5 @@
 # <img src="https://keepassxc.org/logo.png" width="40" height="40"/> KeePassXC
-[![TeamCity Build Status](https://ci.keepassxc.org/app/rest/builds/buildType:\(id:KeepassXC_TeamCityCi\)/statusIcon?guest=1)](https://ci.keepassxc.org/viewType.html?buildTypeId=KeepassXC_TeamCityCi&guest=1)  [![Coverage Status](https://coveralls.io/repos/github/keepassxreboot/keepassxc/badge.svg)](https://coveralls.io/github/keepassxreboot/keepassxc)
+[![TeamCity Build Status](https://ci.keepassxc.org/app/rest/builds/buildType:\(project:KeepassXC\)/statusIcon)](https://ci.keepassxc.org/?guest=1) [![codecov](https://codecov.io/gh/keepassxreboot/keepassxc/branch/develop/graph/badge.svg)](https://codecov.io/gh/keepassxreboot/keepassxc)
 
 ## About KeePassXC
 [KeePassXC](https://keepassxc.org) is a cross-platform community fork of
@@ -29,11 +29,8 @@ so please check out your distribution's package list to see if KeePassXC is avai
 - Using website favicons as entry icons
 - Merging of databases
 - Automatic reload when the database changed on disk
-- Browser integration with KeePassHTTP-Connector for
-[Mozilla Firefox](https://addons.mozilla.org/en-US/firefox/addon/keepasshttp-connector/) and
-[Google Chrome or Chromium](https://chrome.google.com/webstore/detail/keepasshttp-connector/dafgdjggglmmknipkhngniifhplpcldb), and
-[passafari](https://github.com/mmichaa/passafari.safariextension/) in Safari. [[See note about KeePassHTTP]](#Note_about_KeePassHTTP)
 - Browser integration with KeePassXC-Browser using [native messaging](https://developer.chrome.com/extensions/nativeMessaging) for [Mozilla Firefox](https://addons.mozilla.org/en-US/firefox/addon/keepassxc-browser/) and [Google Chrome or Chromium](https://chrome.google.com/webstore/detail/keepassxc-browser/oboonakemofpalcgghocfoadofidjkkk)
+- Synchronize passwords using KeeShare. See [Using Sharing](./docs/QUICKSTART.md#using-sharing) for more details.
 - Many bug fixes
 
 For a full list of features and changes, read the [CHANGELOG](CHANGELOG) document.
@@ -54,15 +51,6 @@ You can of course also directly contribute your own code. We are happy to accept
 
 Please read the [CONTRIBUTING document](.github/CONTRIBUTING.md) for further information.
 
-### Note about KeePassHTTP
+## License
-The KeePassHTTP protocol is not a highly secure protocol.
-It has a certain flaw which could allow an attacker to decrypt your passwords
-should they manage to impersonate the web browser extension from a remote address.
-<!--intercept communication between a KeePassHTTP server
-and PassIFox/chromeIPass over a network connection -->
-(See [here](https://github.com/pfn/keepasshttp/issues/258) and [here](https://github.com/keepassxreboot/keepassxc/issues/147)).
 
-To minimize the risk, KeePassXC strictly limits communication between itself
+GPL-2 or GPL-3
-and the browser plugin to your local computer (localhost).
-This makes your passwords quite safe,
-but as with all open source software, use it at your own risk!

ci/snapcraft/Dockerfile

@@ -1,51 +0,0 @@
-# KeePassXC Linux Release Build Dockerfile
-# Copyright (C) 2017-2018 KeePassXC team <https://keepassxc.org/>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 or (at your option)
-# version 3 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-FROM snapcore/snapcraft
-
-ENV REBUILD_COUNTER=1
-
-ENV QT5_VERSION=510
-ENV QT5_PPA_VERSION=5.10.1
-
-RUN set -x \
-    && apt update -y \
-    && apt -y install software-properties-common
-
-RUN set -x \
-    && add-apt-repository ppa:phoerious/keepassxc
-
-RUN set -x \
-    && apt update -y \
-    && apt-get -y --no-install-recommends install \
-      build-essential \
-      cmake \
-      libgcrypt20-18-dev \
-      libargon2-0-dev \
-      libsodium-dev \
-      qtbase5-dev \
-      qttools5-dev \
-      qttools5-dev-tools \
-      zlib1g-dev \
-      libyubikey-dev \
-      libykpers-1-dev \
-      libxi-dev \
-      libxtst-dev \
-      xvfb
-
-RUN set -x \
-    && apt-get autoremove --purge
-

ci/trusty/Dockerfile

@@ -18,17 +18,18 @@
 
 FROM ubuntu:14.04
 
-ENV REBUILD_COUNTER=4
+ENV REBUILD_COUNTER=5
 
-ENV QT5_VERSION=53
+ENV QT5_VERSION=qt53
 ENV QT5_PPA_VERSION=${QT5_VERSION}2
+ENV TERM=xterm-256color
 
 RUN set -x \
      && apt-get update -y \
      && apt-get -y install software-properties-common
 
 RUN set -x \
-    && add-apt-repository ppa:beineri/opt-qt${QT5_PPA_VERSION}-trusty \
+    && add-apt-repository ppa:beineri/opt-${QT5_PPA_VERSION}-trusty \
     && add-apt-repository ppa:phoerious/keepassxc
 
 RUN set -x \
@@ -38,33 +39,54 @@ RUN set -x \
         clang-3.6 \
         libclang-common-3.6-dev \
         clang-format-3.6 \
+        llvm-3.6 \
         cmake3 \
         make \
         libgcrypt20-18-dev \
         libargon2-0-dev \
         libsodium-dev \
         libcurl-no-gcrypt-dev \
-      qt${QT5_VERSION}base \
+        ${QT5_VERSION}base \
-      qt${QT5_VERSION}tools \
+        ${QT5_VERSION}tools \
-      qt${QT5_VERSION}x11extras \
+        ${QT5_VERSION}x11extras \
-      qt${QT5_VERSION}translations \
+        ${QT5_VERSION}translations \
+        ${QT5_VERSION}svg \
         zlib1g-dev \
         libyubikey-dev \
         libykpers-1-dev \
+        # ubuntu:14.04 has no quazip (it's optional)
+        # libquazip5-dev \
         libxi-dev \
         libxtst-dev \
+        libqrencode-dev \
+        xclip \
         xvfb
 
-ENV CMAKE_PREFIX_PATH="/opt/qt${QT5_VERSION}/lib/cmake"
+ENV PATH="/opt/${QT5_VERSION}/bin:${PATH}"
+ENV CMAKE_PREFIX_PATH="/opt/${QT5_VERSION}/lib/cmake"
 ENV CMAKE_INCLUDE_PATH="/opt/keepassxc-libs/include"
 ENV CMAKE_LIBRARY_PATH="/opt/keepassxc-libs/lib/x86_64-linux-gnu"
 ENV CPATH="${CMAKE_INCLUDE_PATH}"
-ENV LD_LIBRARY_PATH="${CMAKE_LIBRARY_PATH}:/opt/qt${QT5_VERSION}/lib"
+ENV LD_LIBRARY_PATH="${CMAKE_LIBRARY_PATH}:/opt/${QT5_VERSION}/lib"
 
 RUN set -x \
-    && echo "/opt/qt${QT5_VERSION}/lib" > /etc/ld.so.conf.d/qt${QT5_VERSION}.conf \
+    && echo "/opt/${QT5_VERSION}/lib" > /etc/ld.so.conf.d/${QT5_VERSION}.conf \
     && echo "/opt/keepassxc-libs/lib/x86_64-linux-gnu" > /etc/ld.so.conf.d/keepassxc.conf
 
+# AppImage dependencies
+RUN set -x \
+    && apt-get install -y \
+        curl \
+        libfuse2
+
+RUN set -x \
+    && curl -L "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage" > /usr/bin/linuxdeploy \
+    && curl -L "https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage" > /usr/bin/linuxdeploy-plugin-qt \
+    && curl -L "https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage" > /usr/bin/appimagetool \
+    && chmod +x /usr/bin/linuxdeploy \
+    && chmod +x /usr/bin/linuxdeploy-plugin-qt \
+    && chmod +x /usr/bin/appimagetool
+
 RUN set -x \
     && apt-get autoremove --purge \
     && rm -rf /var/lib/apt/lists/*

cmake/CLangFormat.cmake

@@ -0,0 +1,64 @@
+#  Copyright (C) 2017 KeePassXC Team <team@keepassxc.org>
+#
+#  This program is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 2 or (at your option)
+#  version 3 of the License.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+set(EXCLUDED_DIRS
+        # third-party directories
+        src/zxcvbn/
+        # objective-c directories
+        src/touchid/
+        src/autotype/mac/
+        src/gui/macutils/)
+
+set(EXCLUDED_FILES
+        # third-party files
+        streams/qtiocompressor.cpp
+        streams/qtiocompressor.h
+        gui/KMessageWidget.h
+        gui/KMessageWidget.cpp
+        gui/MainWindowAdaptor.h
+        gui/MainWindowAdaptor.cpp
+        crypto/ssh/bcrypt_pbkdf.cpp
+        crypto/ssh/blf.h
+        crypto/ssh/blowfish.c
+        tests/modeltest.cpp
+        tests/modeltest.h
+        # objective-c files
+        core/ScreenLockListenerMac.h
+        core/ScreenLockListenerMac.cpp)
+
+file(GLOB_RECURSE ALL_SOURCE_FILES RELATIVE ${CMAKE_SOURCE_DIR} src/*.cpp src/*.h tests/*.cpp tests/*.h)
+foreach(SOURCE_FILE ${ALL_SOURCE_FILES})
+    foreach(EXCLUDED_DIR ${EXCLUDED_DIRS})
+        string(FIND ${SOURCE_FILE} ${EXCLUDED_DIR} SOURCE_FILE_EXCLUDED)
+        if(NOT ${SOURCE_FILE_EXCLUDED} EQUAL -1)
+            list(REMOVE_ITEM ALL_SOURCE_FILES ${SOURCE_FILE})
+        endif()
+    endforeach()
+    foreach(EXCLUDED_FILE ${EXCLUDED_FILES})
+        if(${SOURCE_FILE} MATCHES ".*${EXCLUDED_FILE}$")
+            list(REMOVE_ITEM ALL_SOURCE_FILES ${SOURCE_FILE})
+        endif()
+    endforeach()
+endforeach()
+
+add_custom_target(format)
+foreach(SOURCE_FILE ${ALL_SOURCE_FILES})
+    add_custom_command(
+            TARGET format
+            PRE_BUILD
+            COMMAND echo Formatting ${SOURCE_FILE}
+            COMMAND clang-format -style=file -i \"${SOURCE_FILE}\"
+            WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
+endforeach()

cmake/CodeCoverage.cmake

@@ -1,4 +1,4 @@
-# Copyright (c) 2012 - 2015, Lars Bilke
+# Copyright (c) 2012 - 2017, Lars Bilke
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,
@@ -26,7 +26,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-#
+# CHANGES:
 #
 # 2012-01-31, Lars Bilke
 # - Enable Code Coverage
@@ -35,167 +35,269 @@
 # - Added support for Clang.
 # - Some additional usage instructions.
 #
+# 2016-02-03, Lars Bilke
+# - Refactored functions to use named parameters
+#
+# 2017-06-02, Lars Bilke
+# - Merged with modified version from github.com/ufz/ogs
+#
+#
 # USAGE:
-
-# 0. (Mac only) If you use Xcode 5.1 make sure to patch geninfo as described here:
-#      http://stackoverflow.com/a/22404544/80480
 #
 # 1. Copy this file into your cmake modules path.
 #
 # 2. Add the following line to your CMakeLists.txt:
-#      INCLUDE(CodeCoverage)
+#      include(CodeCoverage)
 #
-# 3. Set compiler flags to turn off optimization and enable coverage:
+# 3. Append necessary compiler flags:
-#    SET(CMAKE_CXX_FLAGS "-g -O0 -fprofile-arcs -ftest-coverage")
+#      APPEND_COVERAGE_COMPILER_FLAGS()
-#	 SET(CMAKE_C_FLAGS "-g -O0 -fprofile-arcs -ftest-coverage")
 #
-# 3. Use the function SETUP_TARGET_FOR_COVERAGE to create a custom make target
+# 4. If you need to exclude additional directories from the report, specify them
-#    which runs your test executable and produces a lcov code coverage report:
+#    using the COVERAGE_LCOV_EXCLUDES variable before calling SETUP_TARGET_FOR_COVERAGE_LCOV.
 #    Example:
-#	 SETUP_TARGET_FOR_COVERAGE(
+#      set(COVERAGE_LCOV_EXCLUDES 'dir1/*' 'dir2/*')
-#				my_coverage_target  # Name for custom target.
-#				test_driver         # Name of the test driver executable that runs the tests.
-#									# NOTE! This should always have a ZERO as exit code
-#									# otherwise the coverage generation will not complete.
-#				coverage            # Name of output directory.
-#				)
 #
-# 4. Build a Debug build:
+# 5. Use the functions described below to create a custom make target which
+#    runs your test executable and produces a code coverage report.
+#
+# 6. Build a Debug build:
 #      cmake -DCMAKE_BUILD_TYPE=Debug ..
 #      make
 #      make my_coverage_target
 #
-#
+
+include(CMakeParseArguments)
 
 # Check prereqs
-FIND_PROGRAM( GCOV_PATH gcov )
+find_program( GCOV_PATH gcov )
-FIND_PROGRAM( LCOV_PATH lcov )
+find_program( LCOV_PATH  NAMES lcov lcov.bat lcov.exe lcov.perl)
-FIND_PROGRAM( GENHTML_PATH genhtml )
+find_program( GENHTML_PATH NAMES genhtml genhtml.perl genhtml.bat )
-FIND_PROGRAM( GCOVR_PATH gcovr PATHS ${CMAKE_SOURCE_DIR}/tests)
+find_program( GCOVR_PATH gcovr PATHS ${CMAKE_SOURCE_DIR}/scripts/test)
+find_program( SIMPLE_PYTHON_EXECUTABLE python )
 
-IF(NOT GCOV_PATH)
+if(NOT GCOV_PATH)
-	MESSAGE(FATAL_ERROR "gcov not found! Aborting...")
+    message(FATAL_ERROR "gcov not found! Aborting...")
-ENDIF() # NOT GCOV_PATH
+endif() # NOT GCOV_PATH
 
-IF("${CMAKE_CXX_COMPILER_ID}" MATCHES "(Apple)?[Cc]lang")
+if("${CMAKE_CXX_COMPILER_ID}" MATCHES "(Apple)?[Cc]lang")
-	IF("${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS 3)
+    if("${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS 3)
-		MESSAGE(FATAL_ERROR "Clang version must be 3.0.0 or greater! Aborting...")
+        message(FATAL_ERROR "Clang version must be 3.0.0 or greater! Aborting...")
-	ENDIF()
+    endif()
-ELSEIF(NOT CMAKE_COMPILER_IS_GNUCXX)
+elseif(NOT CMAKE_COMPILER_IS_GNUCXX)
-	MESSAGE(FATAL_ERROR "Compiler is not GNU gcc! Aborting...")
+    message(FATAL_ERROR "Compiler is not GNU gcc! Aborting...")
-ENDIF() # CHECK VALID COMPILER
+endif()
 
-SET(CMAKE_CXX_FLAGS_COVERAGE
+set(COVERAGE_COMPILER_FLAGS "-g -O0 --coverage -fprofile-arcs -ftest-coverage"
-    "-g -O0 --coverage -fprofile-arcs -ftest-coverage"
+    CACHE INTERNAL "")
+
+set(CMAKE_CXX_FLAGS_COVERAGE
+    ${COVERAGE_COMPILER_FLAGS}
     CACHE STRING "Flags used by the C++ compiler during coverage builds."
     FORCE )
-SET(CMAKE_C_FLAGS_COVERAGE
+set(CMAKE_C_FLAGS_COVERAGE
-    "-g -O0 --coverage -fprofile-arcs -ftest-coverage"
+    ${COVERAGE_COMPILER_FLAGS}
     CACHE STRING "Flags used by the C compiler during coverage builds."
     FORCE )
-SET(CMAKE_EXE_LINKER_FLAGS_COVERAGE
+set(CMAKE_EXE_LINKER_FLAGS_COVERAGE
     ""
     CACHE STRING "Flags used for linking binaries during coverage builds."
     FORCE )
-SET(CMAKE_SHARED_LINKER_FLAGS_COVERAGE
+set(CMAKE_SHARED_LINKER_FLAGS_COVERAGE
     ""
     CACHE STRING "Flags used by the shared libraries linker during coverage builds."
     FORCE )
-MARK_AS_ADVANCED(
+mark_as_advanced(
     CMAKE_CXX_FLAGS_COVERAGE
     CMAKE_C_FLAGS_COVERAGE
     CMAKE_EXE_LINKER_FLAGS_COVERAGE
     CMAKE_SHARED_LINKER_FLAGS_COVERAGE )
 
-IF ( NOT (CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "Coverage"))
+if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
-  MESSAGE( WARNING "Code coverage results with an optimized (non-Debug) build may be misleading" )
+    message(WARNING "Code coverage results with an optimised (non-Debug) build may be misleading")
-ENDIF() # NOT CMAKE_BUILD_TYPE STREQUAL "Debug"
+endif() # NOT CMAKE_BUILD_TYPE STREQUAL "Debug"
 
+if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
+    link_libraries(gcov)
+else()
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --coverage")
+endif()
 
-# Param _targetname     The name of new the custom make target
+# Defines a target for running and collection code coverage information
-# Param _testrunner     The name of the target which runs the tests.
+# Builds dependencies, runs the given executable and outputs reports.
-#						MUST return ZERO always, even on errors.
+# NOTE! The executable should always have a ZERO as exit code otherwise
-#						If not, no coverage report will be created!
+# the coverage generation will not complete.
-# Param _outputname     lcov output is generated as _outputname.info
+#
-#                       HTML report is generated in _outputname/index.html
+# SETUP_TARGET_FOR_COVERAGE_LCOV(
-# Optional fourth parameter is passed as arguments to _testrunner
+#     NAME testrunner_coverage                    # New target name
-#   Pass them in list form, e.g.: "-j;2" for -j 2
+#     EXECUTABLE testrunner -j ${PROCESSOR_COUNT} # Executable in PROJECT_BINARY_DIR
-FUNCTION(SETUP_TARGET_FOR_COVERAGE _targetname _testrunner _outputname)
+#     DEPENDENCIES testrunner                     # Dependencies to build first
+# )
+function(SETUP_TARGET_FOR_COVERAGE_LCOV)
 
-	IF(NOT LCOV_PATH)
+    set(options NONE)
-		MESSAGE(FATAL_ERROR "lcov not found! Aborting...")
+    set(oneValueArgs NAME)
-	ENDIF() # NOT LCOV_PATH
+    set(multiValueArgs EXECUTABLE EXECUTABLE_ARGS DEPENDENCIES)
+    cmake_parse_arguments(Coverage "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
 
-	IF(NOT GENHTML_PATH)
+    if(NOT LCOV_PATH)
-		MESSAGE(FATAL_ERROR "genhtml not found! Aborting...")
+        message(FATAL_ERROR "lcov not found! Aborting...")
-	ENDIF() # NOT GENHTML_PATH
+    endif() # NOT LCOV_PATH
 
-	SET(coverage_info "${CMAKE_BINARY_DIR}/${_outputname}.info")
+    if(NOT GENHTML_PATH)
-	IF(MINGW)
+        message(FATAL_ERROR "genhtml not found! Aborting...")
-		# Replace C:/ with /C for MINGW
+    endif() # NOT GENHTML_PATH
-		STRING(REGEX REPLACE "^([a-zA-Z]):" "/\\1" coverage_info ${coverage_info})
-	ENDIF()
-	SET(coverage_cleaned "${coverage_info}.cleaned")
-
-	SEPARATE_ARGUMENTS(test_command UNIX_COMMAND "${_testrunner}")
 
     # Setup target
-	ADD_CUSTOM_TARGET(${_targetname}
+    add_custom_target(${Coverage_NAME}
 
         # Cleanup lcov
-		${LCOV_PATH} --directory . --zerocounters
+        COMMAND ${LCOV_PATH} --gcov-tool ${GCOV_PATH} -directory . --zerocounters
+        # Create baseline to make sure untouched files show up in the report
+        COMMAND ${LCOV_PATH} --gcov-tool ${GCOV_PATH} -c -i -d . -o ${Coverage_NAME}.base
 
         # Run tests
-		COMMAND ${test_command} ${ARGV3}
+        COMMAND ${Coverage_EXECUTABLE}
 
         # Capturing lcov counters and generating report
-		COMMAND ${LCOV_PATH} --directory . --capture --output-file ${coverage_info}
+        COMMAND ${LCOV_PATH} --gcov-tool ${GCOV_PATH} --directory . --capture --output-file ${Coverage_NAME}.info
-		COMMAND ${LCOV_PATH} --remove ${coverage_info} 'tests/*' '/usr/*' --output-file ${coverage_cleaned}
+        # add baseline counters
-		COMMAND ${GENHTML_PATH} -o ${_outputname} ${coverage_cleaned}
+        COMMAND ${LCOV_PATH} --gcov-tool ${GCOV_PATH} -a ${Coverage_NAME}.base -a ${Coverage_NAME}.info --output-file ${Coverage_NAME}.total
-		COMMAND ${CMAKE_COMMAND} -E remove ${coverage_info} ${coverage_cleaned}
+        COMMAND ${LCOV_PATH} --gcov-tool ${GCOV_PATH} --remove ${Coverage_NAME}.total ${COVERAGE_LCOV_EXCLUDES} --output-file ${PROJECT_BINARY_DIR}/${Coverage_NAME}.info.cleaned
+        COMMAND ${GENHTML_PATH} -o ${Coverage_NAME} ${PROJECT_BINARY_DIR}/${Coverage_NAME}.info.cleaned
+        COMMAND ${CMAKE_COMMAND} -E remove ${Coverage_NAME}.base ${Coverage_NAME}.total ${PROJECT_BINARY_DIR}/${Coverage_NAME}.info.cleaned
 
-		WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+        WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+        DEPENDS ${Coverage_DEPENDENCIES}
         COMMENT "Resetting code coverage counters to zero.\nProcessing code coverage counters and generating report."
     )
 
-	# Show info where to find the report
+    # Show where to find the lcov info report
-	ADD_CUSTOM_COMMAND(TARGET ${_targetname} POST_BUILD
+    add_custom_command(TARGET ${Coverage_NAME} POST_BUILD
         COMMAND ;
-		COMMENT "Open ./${_outputname}/index.html in your browser to view the coverage report."
+        COMMENT "Lcov code coverage info report saved in ${Coverage_NAME}.info."
     )
 
-ENDFUNCTION() # SETUP_TARGET_FOR_COVERAGE
+    # Show info where to find the report
+    add_custom_command(TARGET ${Coverage_NAME} POST_BUILD
+        COMMAND ;
+        COMMENT "Open ./${Coverage_NAME}/index.html in your browser to view the coverage report."
+    )
 
-# Param _targetname     The name of new the custom make target
+endfunction() # SETUP_TARGET_FOR_COVERAGE_LCOV
-# Param _testrunner     The name of the target which runs the tests
-# Param _outputname     cobertura output is generated as _outputname.xml
-# Optional fourth parameter is passed as arguments to _testrunner
-#   Pass them in list form, e.g.: "-j;2" for -j 2
-FUNCTION(SETUP_TARGET_FOR_COVERAGE_COBERTURA _targetname _testrunner _outputname)
 
-	IF(NOT PYTHON_EXECUTABLE)
+# Defines a target for running and collection code coverage information
-		MESSAGE(FATAL_ERROR "Python not found! Aborting...")
+# Builds dependencies, runs the given executable and outputs reports.
-	ENDIF() # NOT PYTHON_EXECUTABLE
+# NOTE! The executable should always have a ZERO as exit code otherwise
+# the coverage generation will not complete.
+#
+# SETUP_TARGET_FOR_COVERAGE_GCOVR_XML(
+#     NAME ctest_coverage                    # New target name
+#     EXECUTABLE ctest -j ${PROCESSOR_COUNT} # Executable in PROJECT_BINARY_DIR
+#     DEPENDENCIES executable_target         # Dependencies to build first
+# )
+function(SETUP_TARGET_FOR_COVERAGE_GCOVR_XML)
 
-	IF(NOT GCOVR_PATH)
+    set(options NONE)
-		MESSAGE(FATAL_ERROR "gcovr not found! Aborting...")
+    set(oneValueArgs NAME)
-	ENDIF() # NOT GCOVR_PATH
+    set(multiValueArgs EXECUTABLE EXECUTABLE_ARGS DEPENDENCIES)
+    cmake_parse_arguments(Coverage "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
 
-	ADD_CUSTOM_TARGET(${_targetname}
+    if(NOT SIMPLE_PYTHON_EXECUTABLE)
+        message(FATAL_ERROR "python not found! Aborting...")
+    endif() # NOT SIMPLE_PYTHON_EXECUTABLE
 
+    if(NOT GCOVR_PATH)
+        message(FATAL_ERROR "gcovr not found! Aborting...")
+    endif() # NOT GCOVR_PATH
+
+    # Combine excludes to several -e arguments
+    set(GCOVR_EXCLUDES "")
+    foreach(EXCLUDE ${COVERAGE_GCOVR_EXCLUDES})
+        list(APPEND GCOVR_EXCLUDES "-e")
+        list(APPEND GCOVR_EXCLUDES "${EXCLUDE}")
+    endforeach()
+
+    add_custom_target(${Coverage_NAME}
         # Run tests
-		${_testrunner} ${ARGV3}
+        ${Coverage_EXECUTABLE}
 
         # Running gcovr
-		COMMAND ${GCOVR_PATH} -x -r ${CMAKE_SOURCE_DIR} -e '${CMAKE_SOURCE_DIR}/tests/'  -o ${_outputname}.xml
+        COMMAND ${GCOVR_PATH} --xml
-		WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+            -r ${PROJECT_SOURCE_DIR} ${GCOVR_EXCLUDES}
+            --object-directory=${PROJECT_BINARY_DIR}
+            -o ${Coverage_NAME}.xml
+        WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+        DEPENDS ${Coverage_DEPENDENCIES}
         COMMENT "Running gcovr to produce Cobertura code coverage report."
     )
 
     # Show info where to find the report
-	ADD_CUSTOM_COMMAND(TARGET ${_targetname} POST_BUILD
+    add_custom_command(TARGET ${Coverage_NAME} POST_BUILD
         COMMAND ;
-		COMMENT "Cobertura code coverage report saved in ${_outputname}.xml."
+        COMMENT "Cobertura code coverage report saved in ${Coverage_NAME}.xml."
     )
 
-ENDFUNCTION() # SETUP_TARGET_FOR_COVERAGE_COBERTURA
+endfunction() # SETUP_TARGET_FOR_COVERAGE_GCOVR_XML
+
+# Defines a target for running and collection code coverage information
+# Builds dependencies, runs the given executable and outputs reports.
+# NOTE! The executable should always have a ZERO as exit code otherwise
+# the coverage generation will not complete.
+#
+# SETUP_TARGET_FOR_COVERAGE_GCOVR_HTML(
+#     NAME ctest_coverage                    # New target name
+#     EXECUTABLE ctest -j ${PROCESSOR_COUNT} # Executable in PROJECT_BINARY_DIR
+#     DEPENDENCIES executable_target         # Dependencies to build first
+# )
+function(SETUP_TARGET_FOR_COVERAGE_GCOVR_HTML)
+
+    set(options NONE)
+    set(oneValueArgs NAME)
+    set(multiValueArgs EXECUTABLE EXECUTABLE_ARGS DEPENDENCIES)
+    cmake_parse_arguments(Coverage "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+
+    if(NOT SIMPLE_PYTHON_EXECUTABLE)
+        message(FATAL_ERROR "python not found! Aborting...")
+    endif() # NOT SIMPLE_PYTHON_EXECUTABLE
+
+    if(NOT GCOVR_PATH)
+        message(FATAL_ERROR "gcovr not found! Aborting...")
+    endif() # NOT GCOVR_PATH
+
+    # Combine excludes to several -e arguments
+    set(GCOVR_EXCLUDES "")
+    foreach(EXCLUDE ${COVERAGE_GCOVR_EXCLUDES})
+        list(APPEND GCOVR_EXCLUDES "-e")
+        list(APPEND GCOVR_EXCLUDES "${EXCLUDE}")
+    endforeach()
+
+    add_custom_target(${Coverage_NAME}
+        # Run tests
+        ${Coverage_EXECUTABLE}
+
+        # Create folder
+        COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/${Coverage_NAME}
+
+        # Running gcovr
+        COMMAND ${GCOVR_PATH} --html --html-details
+            -r ${PROJECT_SOURCE_DIR} ${GCOVR_EXCLUDES}
+            --object-directory=${PROJECT_BINARY_DIR}
+            -o ${Coverage_NAME}/index.html
+        WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+        DEPENDS ${Coverage_DEPENDENCIES}
+        COMMENT "Running gcovr to produce HTML code coverage report."
+    )
+
+    # Show info where to find the report
+    add_custom_command(TARGET ${Coverage_NAME} POST_BUILD
+        COMMAND ;
+        COMMENT "Open ./${Coverage_NAME}/index.html in your browser to view the coverage report."
+    )
+
+endfunction() # SETUP_TARGET_FOR_COVERAGE_GCOVR_HTML
+
+function(APPEND_COVERAGE_COMPILER_FLAGS)
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${COVERAGE_COMPILER_FLAGS}" PARENT_SCOPE)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COVERAGE_COMPILER_FLAGS}" PARENT_SCOPE)
+    message(STATUS "Appending code coverage compiler flags: ${COVERAGE_COMPILER_FLAGS}")
+endfunction() # APPEND_COVERAGE_COMPILER_FLAGS

cmake/FindQREncode.cmake

@@ -0,0 +1,22 @@
+#  Copyright (C) 2017 KeePassXC Team <team@keepassxc.org>
+#
+#  This program is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 2 or (at your option)
+#  version 3 of the License.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+find_path(QRENCODE_INCLUDE_DIR qrencode.h)
+find_library(QRENCODE_LIBRARY qrencode)
+
+mark_as_advanced(QRENCODE_LIBRARY QRENCODE_INCLUDE_DIR)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(QREncode DEFAULT_MSG QRENCODE_LIBRARY QRENCODE_INCLUDE_DIR)

cmake/FindQuaZip.cmake

@@ -0,0 +1,41 @@
+# QUAZIP_FOUND               - QuaZip library was found
+# QUAZIP_INCLUDE_DIR         - Path to QuaZip include dir
+# QUAZIP_INCLUDE_DIRS        - Path to QuaZip and zlib include dir (combined from QUAZIP_INCLUDE_DIR + ZLIB_INCLUDE_DIR)
+# QUAZIP_LIBRARIES           - List of QuaZip libraries
+# QUAZIP_ZLIB_INCLUDE_DIR    - The include dir of zlib headers
+
+IF(QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES)
+  # in cache already
+  SET(QUAZIP_FOUND TRUE)
+ELSE(QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES)
+    IF(Qt5Core_FOUND)
+        set(QUAZIP_LIB_VERSION_SUFFIX 5)
+    ENDIF()
+  IF(WIN32)
+    FIND_PATH(QUAZIP_LIBRARY_DIR
+      WIN32_DEBUG_POSTFIX d
+      NAMES libquazip${QUAZIP_LIB_VERSION_SUFFIX}.dll
+      HINTS "C:/Programme/" "C:/Program Files"
+      PATH_SUFFIXES QuaZip/lib
+    )
+    FIND_LIBRARY(QUAZIP_LIBRARIES NAMES libquazip${QUAZIP_LIB_VERSION_SUFFIX}.dll HINTS ${QUAZIP_LIBRARY_DIR})
+    FIND_PATH(QUAZIP_INCLUDE_DIR NAMES quazip.h HINTS ${QUAZIP_LIBRARY_DIR}/../ PATH_SUFFIXES include/quazip5)
+    FIND_PATH(QUAZIP_ZLIB_INCLUDE_DIR NAMES zlib.h)
+  ELSE(WIN32)
+    FIND_PACKAGE(PkgConfig)
+    pkg_check_modules(PC_QUAZIP quazip)
+    FIND_LIBRARY(QUAZIP_LIBRARIES
+      WIN32_DEBUG_POSTFIX d
+      NAMES quazip${QUAZIP_LIB_VERSION_SUFFIX}
+      HINTS /usr/lib /usr/lib64
+    )
+    FIND_PATH(QUAZIP_INCLUDE_DIR quazip.h
+      HINTS /usr/include /usr/local/include
+      PATH_SUFFIXES quazip${QUAZIP_LIB_VERSION_SUFFIX}
+    )
+    FIND_PATH(QUAZIP_ZLIB_INCLUDE_DIR zlib.h HINTS /usr/include /usr/local/include)
+  ENDIF(WIN32)
+  INCLUDE(FindPackageHandleStandardArgs)
+  SET(QUAZIP_INCLUDE_DIRS ${QUAZIP_INCLUDE_DIR} ${QUAZIP_ZLIB_INCLUDE_DIR})
+  find_package_handle_standard_args(QUAZIP DEFAULT_MSG  QUAZIP_LIBRARIES QUAZIP_INCLUDE_DIR QUAZIP_ZLIB_INCLUDE_DIR QUAZIP_INCLUDE_DIRS)
+ENDIF(QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES)

cmake/GenerateProductVersion.cmake

@@ -91,7 +91,7 @@ function(generate_product_version outfiles)
         set(PRODUCT_COMPANY_COPYRIGHT "Copyright (C) ${PRODUCT_CURRENT_YEAR} ${PRODUCT_COMPANY_NAME}")
     endif()
     if (NOT PRODUCT_COMMENTS OR "${PRODUCT_COMMENTS}" STREQUAL "")
-        set(PRODUCT_COMMENTS "${PRODUCT_NAME} v${PRODUCT_VERSION_MAJOR}.${PRODUCT_VERSION_MINOR}")
+        set(PRODUCT_COMMENTS "${PRODUCT_NAME} v${PRODUCT_VERSION_MAJOR}.${PRODUCT_VERSION_MINOR}.${PRODUCT_VERSION_PATCH}")
     endif()
     if (NOT PRODUCT_ORIGINAL_FILENAME OR "${PRODUCT_ORIGINAL_FILENAME}" STREQUAL "")
         set(PRODUCT_ORIGINAL_FILENAME "${PRODUCT_NAME}")

cmake/GetGitRevisionDescription.cmake

@@ -1,130 +0,0 @@
-# - Returns a version string from Git
-#
-# These functions force a re-configure on each git commit so that you can
-# trust the values of the variables in your build system.
-#
-#  get_git_head_revision(<refspecvar> <hashvar> [<additional arguments to git describe> ...])
-#
-# Returns the refspec and sha hash of the current head revision
-#
-#  git_describe(<var> [<additional arguments to git describe> ...])
-#
-# Returns the results of git describe on the source tree, and adjusting
-# the output so that it tests false if an error occurs.
-#
-#  git_get_exact_tag(<var> [<additional arguments to git describe> ...])
-#
-# Returns the results of git describe --exact-match on the source tree,
-# and adjusting the output so that it tests false if there was no exact
-# matching tag.
-#
-# Requires CMake 2.6 or newer (uses the 'function' command)
-#
-# Original Author:
-# 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net>
-# http://academic.cleardefinition.com
-# Iowa State University HCI Graduate Program/VRAC
-#
-# Copyright Iowa State University 2009-2010.
-# Distributed under the Boost Software License, Version 1.0.
-# (See accompanying file LICENSE.BOOST-1.0 or copy at
-# http://www.boost.org/LICENSE_1_0.txt)
-
-if(__get_git_revision_description)
-	return()
-endif()
-set(__get_git_revision_description YES)
-
-# We must run the following at "include" time, not at function call time,
-# to find the path to this module rather than the path to a calling list file
-get_filename_component(_gitdescmoddir ${CMAKE_CURRENT_LIST_FILE} PATH)
-
-function(get_git_head_revision _refspecvar _hashvar)
-	set(GIT_PARENT_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
-	set(GIT_DIR "${GIT_PARENT_DIR}/.git")
-	while(NOT EXISTS "${GIT_DIR}")	# .git dir not found, search parent directories
-		set(GIT_PREVIOUS_PARENT "${GIT_PARENT_DIR}")
-		get_filename_component(GIT_PARENT_DIR ${GIT_PARENT_DIR} PATH)
-		if(GIT_PARENT_DIR STREQUAL GIT_PREVIOUS_PARENT)
-			# We have reached the root directory, we are not in git
-			set(${_refspecvar} "GITDIR-NOTFOUND" PARENT_SCOPE)
-			set(${_hashvar} "GITDIR-NOTFOUND" PARENT_SCOPE)
-			return()
-		endif()
-		set(GIT_DIR "${GIT_PARENT_DIR}/.git")
-	endwhile()
-	# check if this is a submodule
-	if(NOT IS_DIRECTORY ${GIT_DIR})
-		file(READ ${GIT_DIR} submodule)
-		string(REGEX REPLACE "gitdir: (.*)\n$" "\\1" GIT_DIR_RELATIVE ${submodule})
-		get_filename_component(SUBMODULE_DIR ${GIT_DIR} PATH)
-		get_filename_component(GIT_DIR ${SUBMODULE_DIR}/${GIT_DIR_RELATIVE} ABSOLUTE)
-	endif()
-	set(GIT_DATA "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/git-data")
-	if(NOT EXISTS "${GIT_DATA}")
-		file(MAKE_DIRECTORY "${GIT_DATA}")
-	endif()
-
-	if(NOT EXISTS "${GIT_DIR}/HEAD")
-		return()
-	endif()
-	set(HEAD_FILE "${GIT_DATA}/HEAD")
-	configure_file("${GIT_DIR}/HEAD" "${HEAD_FILE}" COPYONLY)
-
-	configure_file("${_gitdescmoddir}/GetGitRevisionDescription.cmake.in"
-		"${GIT_DATA}/grabRef.cmake"
-		@ONLY)
-	include("${GIT_DATA}/grabRef.cmake")
-
-	set(${_refspecvar} "${HEAD_REF}" PARENT_SCOPE)
-	set(${_hashvar} "${HEAD_HASH}" PARENT_SCOPE)
-endfunction()
-
-function(git_describe _var)
-	if(NOT GIT_FOUND)
-		find_package(Git QUIET)
-	endif()
-	get_git_head_revision(refspec hash)
-	if(NOT GIT_FOUND)
-		set(${_var} "GIT-NOTFOUND" PARENT_SCOPE)
-		return()
-	endif()
-	if(NOT hash)
-		set(${_var} "HEAD-HASH-NOTFOUND" PARENT_SCOPE)
-		return()
-	endif()
-
-	# TODO sanitize
-	#if((${ARGN}" MATCHES "&&") OR
-	#	(ARGN MATCHES "||") OR
-	#	(ARGN MATCHES "\\;"))
-	#	message("Please report the following error to the project!")
-	#	message(FATAL_ERROR "Looks like someone's doing something nefarious with git_describe! Passed arguments ${ARGN}")
-	#endif()
-
-	#message(STATUS "Arguments to execute_process: ${ARGN}")
-
-	execute_process(COMMAND
-		"${GIT_EXECUTABLE}"
-		describe
-		${hash}
-		${ARGN}
-		WORKING_DIRECTORY
-		"${CMAKE_SOURCE_DIR}"
-		RESULT_VARIABLE
-		res
-		OUTPUT_VARIABLE
-		out
-		ERROR_QUIET
-		OUTPUT_STRIP_TRAILING_WHITESPACE)
-	if(NOT res EQUAL 0)
-		set(out "${out}-${res}-NOTFOUND")
-	endif()
-
-	set(${_var} "${out}" PARENT_SCOPE)
-endfunction()
-
-function(git_get_exact_tag _var)
-	git_describe(out --exact-match ${ARGN})
-	set(${_var} "${out}" PARENT_SCOPE)
-endfunction()

cmake/GetGitRevisionDescription.cmake.in

@@ -1,41 +0,0 @@
-#
-# Internal file for GetGitRevisionDescription.cmake
-#
-# Requires CMake 2.6 or newer (uses the 'function' command)
-#
-# Original Author:
-# 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net>
-# http://academic.cleardefinition.com
-# Iowa State University HCI Graduate Program/VRAC
-#
-# Copyright Iowa State University 2009-2010.
-# Distributed under the Boost Software License, Version 1.0.
-# (See accompanying file LICENSE.BOOST-1.0 or copy at
-# http://www.boost.org/LICENSE_1_0.txt)
-
-set(HEAD_HASH)
-
-file(READ "@HEAD_FILE@" HEAD_CONTENTS LIMIT 1024)
-
-string(STRIP "${HEAD_CONTENTS}" HEAD_CONTENTS)
-if(HEAD_CONTENTS MATCHES "ref")
-	# named branch
-	string(REPLACE "ref: " "" HEAD_REF "${HEAD_CONTENTS}")
-	if(EXISTS "@GIT_DIR@/${HEAD_REF}")
-		configure_file("@GIT_DIR@/${HEAD_REF}" "@GIT_DATA@/head-ref" COPYONLY)
-	else()
-		configure_file("@GIT_DIR@/packed-refs" "@GIT_DATA@/packed-refs" COPYONLY)
-		file(READ "@GIT_DATA@/packed-refs" PACKED_REFS)
-		if(${PACKED_REFS} MATCHES "([0-9a-z]*) ${HEAD_REF}")
-			set(HEAD_HASH "${CMAKE_MATCH_1}")
-		endif()
-	endif()
-else()
-	# detached HEAD
-	configure_file("@GIT_DIR@/HEAD" "@GIT_DATA@/head-ref" COPYONLY)
-endif()
-
-if(NOT HEAD_HASH)
-	file(READ "@GIT_DATA@/head-ref" HEAD_HASH LIMIT 1024)
-	string(STRIP "${HEAD_HASH}" HEAD_HASH)
-endif()

docs/QUICKSTART.md

@@ -24,17 +24,18 @@ for all your websites, programs, etc.
 ## Setting up Browser Integration with KeePassXC
 
 * *Within KeePassXC*, go to **Tools->Settings** (on macOS, go to **KeePassXC->Preferences**.) 
-* In **Browser Integration**, check **Enable KeePassHTTP server**
+* In **Browser Integration**, check **Enable KeePassXC browser integration**
+* Right below that, click the checkbox for the browser(s) you use
 Leave the other options at their defaults.
-* *In your default web browser,* install the KeePassHTTP-Connector extension/add-on. Instructions for [Firefox](https://addons.mozilla.org/en-US/firefox/addon/keepasshttp-connector/?src=api) or [Chrome](https://chrome.google.com/webstore/detail/keepasshttp-connector/dafgdjggglmmknipkhngniifhplpcldb?utm_source=chrome-app-launcher-info-dialog) 
+* *In your default web browser,* install the KeePassXC Browser extension/add-on. Instructions for [Firefox or Tor Browser](https://addons.mozilla.org/en-US/firefox/addon/keepassxc-browser/) or [Chrome](https://chrome.google.com/webstore/detail/keepassxc-browser/oboonakemofpalcgghocfoadofidjkkk)
 * Click the KeePassXC icon in the upper-right corner. You'll see the dialog below. 
 * Click the blue Connect button to make the browser extension connect to the KeePassXC application. 
-<img src="./KeePassXC-Connect.png" height="200" alt="KeePassXC Connect dialog">
+<img src="./KeePassHTTP/KeePassXC-Connect.png" height="200" alt="KeePassXC Connect dialog">
 
 * *Switch back to KeePassXC.* You'll see a dialog (below) indicating that a request to connect has arrived. 
 * Give the connection a name (perhaps *Keepass-Browsername*, any unique name will suffice) and click OK to accept it.
 * This one-time operation connects KeePassXC and your browser.
-<img src="./KeePassXC-Accept-Button.png" height="200" alt="KeePassXC accept connection dialog">
+<img src="./KeePassHTTP/KeePassXC-Accept-Button.png" height="200" alt="KeePassXC accept connection dialog">
 
 ## Using Browser Integration
 
@@ -44,4 +45,87 @@ or select it and type Ctrl+U (Cmd+U on macOS).
 * If there are username/password fields on that page, you will see the dialog below.
 Click *Allow* to confirm that KeePassXC may access the credentials to auto-fill the fields. 
 * Check *Remember this decision* to allow this each time you visit the page.
-<img src="./KeePassXC-Confirm.png" height="200" alt="KeePassCX Confirm Access dialog">
+<img src="./KeePassHTTP/KeePassXC-Confirm.png" height="200" alt="KeePassCX Confirm Access dialog">
+
+## Using Sharing
+
+Sharing allows you to share a subset of your credentials with others and vice versa.
+
+### Enable Sharing
+
+To use sharing, you need to enable for the application.
+
+1. Go to Tools &rarr; Settings
+2. Select the category KeeShare
+3. Check _Allow import_ if you want to import shared credentials
+4. Check _Allow export_ if you want to share credentials
+
+To make sure that your data is valid when im imported by another client, please _generate_ (or _import_) a public/private key pair and enter your _signer_ name. This way your client may verify that the imported data is valid. When Importing, you'll see the known sources with names and fingerprint in the list at the bottom. This is the place to _trust_ or _untrust_ signers. It is only possible to trust someone on application level.
+
+<img src="./KeeShare/AppSettings.png" height="600" width="800" alt="KeeShare Application Settings">
+
+### Sharing Credentials
+
+If you checked _Allow export_ in the Sharing settings you now are good to go to share some passwords with others. Sharing always is defined on a group. If you enable sharing on a group, every entry under this group or it's children is shared. If you enable sharing on the root node, **every password** inside your database gets shared!
+
+1. Open the edit sheet on a group you want to share
+1. Select the sharing section
+1. Choose _Export to path_ as the sharing method
+1. Choose a path to store the shared credentials to
+1. Generate a password for this share container
+
+The export file will not be generated automatically. Instead, each time the database is saved, the file gets written (so please deactivate the autosafe feature). If an old file is present, the old file will be overwritten! The file should be written to a location that is accessible by others. An easy setup is a network share or storing the file inside the cloud. 
+
+<img src="./KeeShare/GroupSettings_Export.png" height="600" width="800" alt="KeeShare Group Sharing Settings">
+
+### Using Shared Credentials
+
+Checking _Allow import_ in the Sharing settings of the database enables you to receive credentials from others. KeePass will watch sharing sources and import any changes immediately into your database using the synchronization feature.
+
+1. Create a group for import
+1. Open the edit sheet on that group
+1. Select the sharing section
+1. Choose _Import from path_ as the sharing method
+1. Choose a share container that is shared with you
+1. Enter the password for the shared container
+
+KeeShare observes the container for changes and merges them into your database when necessary. Importing merges in time order, so older data is moved to the history, which should have a sufficient size to prevent loss of needed data. 
+
+Please note, that the import currently is not restricted to the configured group. Every entry which was imported and moved outside the import group will be updated regardless of it's location!
+
+<img src="./KeeShare/GroupSettings_Import.png" height="600" width="800" alt="KeeShare Group Import Settings">
+
+### Using Synchronized Credentials
+
+Instead of using different groups for sharing and importing you can use a single group that acts as both. This way you can synchronize a number of credentials easily across many users without a lot of hassle.
+
+1. Open the edit sheet on a group you want to synchronize
+1. Select the sharing section
+1. Choose _Synchronize with path_ as the sharing method
+1. Choose a database that you want to use a synchronization file
+1. Enter the password for the database
+
+<img src="./KeeShare/GroupSettings_Sync.png" height="600" width="800" alt="KeeShare Group Synchronization Settings">
+
+### Disable Sharing for Credentials
+
+In case you don't want to share (import or export) some credentials, it is possible to you can 
+* use the application settings and uncheck the options or 
+* instead of selecting _Import from path_, _Export to path_ or _Synchronize with path_ you'll select _Inactive_ while leaving the path and the password untouched
+
+### Sharing overview
+
+There is a simple overview of shared groups to keep track of your data.
+
+1. Open the Database Settings
+1. Select the KeeShare category
+
+<img src="./KeeShare/DatabaseSettings.png" height="600" width="800" alt="KeeShare Group Sharing Ovewview">
+
+## Technical Details and Limitations of Sharing
+
+Sharing relies on the combination of file exports and imports as well as the synchronization mechanism provided by KeePassXC. Since the merge algorithm uses the history of entries to prevent data loss, this history must be enabled and have a sufficient size. Furthermore, the merge algorithm is location independend, therefore it does not matter if entries are moved outside of an import group. These entries will be updated none the less. Moving entries outside of export groups will prevent a further export of the entry, but it will not ensure that the already shared data will be removed from any client.
+
+KeeShare uses a custom certification mechanism to ensure that the source of the data is the expected one. This ensures that the data was exported by the signer but it is not possible to detect if someone replaced the data with an older version from a valid signer. To prevent this, the container could be placed at a location which is only writeable for valid signers.
+
+

release-tool

@@ -35,7 +35,7 @@ TAG_NAME=""
 DOCKER_IMAGE=""
 DOCKER_CONTAINER_NAME="keepassxc-build-container"
 CMAKE_OPTIONS=""
-CPACK_GENERATORS="NSIS;ZIP"
+CPACK_GENERATORS="WIX;ZIP"
 COMPILER="g++"
 MAKE_OPTIONS="-j8"
 BUILD_PLUGINS="all"
@@ -50,7 +50,8 @@ printUsage() {
     local cmd
     if [ "" == "$1" ] || [ "help" == "$1" ]; then
         cmd="COMMAND"
-    elif [ "check" == "$1" ] || [ "merge" == "$1" ] || [ "build" == "$1" ] || [ "gpgsign" == "$1" ] || [ "appsign" == "$1" ]; then
+    elif [ "check" == "$1" ] || [ "merge" == "$1" ] || [ "build" == "$1" ] \
+        || [ "gpgsign" == "$1" ] || [ "appsign" == "$1" ] || [ "appimage" == "$1" ]; then
         cmd="$1"
     else
         logError "Unknown command: '$1'\n"
@@ -107,6 +108,8 @@ Options:
                           The container must not exist already
       --snapcraft         Create and use docker image to build snapcraft distribution.
                           This option has no effect if --docker-image is not set.
+      --appimage          Build a Linux AppImage after compilation.
+                          If this option is set, --install-prefix has no effect
       --appsign           Perform platform specific App Signing before packaging
   -k, --key               Specify the App Signing Key/Identity
   -c, --cmake-options     Additional CMake options for compiling the sources
@@ -139,6 +142,25 @@ Options:
   -f, --files        Files to sign (required)
   -k, --key          Signing Key or Apple Developer ID
   -h, --help         Show this help
+EOF
+    elif [ "appimage" == "$cmd" ]; then
+        cat << EOF
+
+Generate Linux AppImage from 'make install' AppDir
+
+Options:
+  -a, --appdir         Input AppDir (required)
+  -v, --version        KeePassXC version
+  -o, --output-dir     Output directory where to build the AppImage
+                       (default: '${OUTPUT_DIR}')
+  -d, --docker-image   Use the specified Docker image to build the AppImage.
+                       The image must have all required build dependencies installed.
+      --container-name Docker container name (default: '${DOCKER_CONTAINER_NAME}')
+                       The container must not exist already
+      --appsign        Embed a PGP signature into the AppImage
+  -k, --key            The PGP Signing Key
+      --verbosity      linuxdeploy verbosity (default: 3)
+  -h, --help           Show this help
 EOF
     fi
 }
@@ -192,6 +214,10 @@ exitTrap() {
     exitError "Existing upon user request..."
 }
 
+cmdExists() {
+    command -v "$1" &> /dev/null
+}
+
 checkSourceDirExists() {
     if [ ! -d "$SRC_DIR" ]; then
         exitError "Source directory '${SRC_DIR}' does not exist!"
@@ -210,15 +236,8 @@ checkGitRepository() {
     fi
 }
 
-checkTagExists() {
-    git tag | grep -q "$TAG_NAME"
-    if [ $? -ne 0 ]; then
-        exitError "Tag '${TAG_NAME}' does not exist!"
-    fi
-}
-
 checkReleaseDoesNotExist() {
-    git tag | grep -q "$TAG_NAME"
+    git tag | grep -q "^$TAG_NAME$"
     if [ $? -eq 0 ]; then
         exitError "Release '$RELEASE_NAME' (tag: '$TAG_NAME') already exists!"
     fi
@@ -299,41 +318,34 @@ checkSnapcraft() {
     if [ $? -ne 0 ]; then
         exitError "'snapcraft.yaml' has not been updated to the '${RELEASE_NAME}' release!"
     fi
+
+    grep -qPzo "KEEPASSXC_BUILD_TYPE=Release" snapcraft.yaml
+    if [ $? -ne 0 ]; then
+        exitError "'snapcraft.yaml' is not set for a release build!"
+    fi
 }
 
 checkTransifexCommandExists() {
-    command -v tx > /dev/null
+    if ! cmdExists tx; then
-    if [ 0 -ne $? ]; then
         exitError "Transifex tool 'tx' not installed! Please install it using 'pip install transifex-client'."
     fi
 }
 
-checkOsslsigncodeCommandExists() {
-    command -v osslsigncode > /dev/null
-    if [ 0 -ne $? ]; then
-        exitError "osslsigncode command not found on the PATH! Please install it using 'pacman -S mingw-w64-osslsigncode'."
-    fi
-}
-
 checkSigntoolCommandExists() {
-    command -v signtool > /dev/null
+    if ! cmdExists signtool; then
-    if [ 0 -ne $? ]; then
         exitError "signtool command not found on the PATH! Add the Windows SDK binary folder to your PATH."
     fi
 }
 
 checkCodesignCommandExists() {
-    command -v codesign > /dev/null
+    if ! cmdExists codesign; then
-    if [ 0 -ne $? ]; then
         exitError "codesign command not found on the PATH! Please check that you have correctly installed Xcode."
     fi
 }
 
 checkQt5LUpdateExists() {
-    command -v lupdate > /dev/null
+    if cmdExists lupdate && ! $(lupdate -version | grep -q "lupdate version 5\."); then
-    if [ 0 -eq $? ] && ! $(lupdate -version | grep -q "lupdate version 5\."); then
+        if ! cmdExists lupdate-qt5; then
-        command -v lupdate-qt5 > /dev/null
-        if [ 0 -ne $? ]; then
             exitError "Qt Linguist tool (lupdate-qt5) is not installed! Please install using 'apt install qttools5-dev-tools'"
         fi
     fi
@@ -372,7 +384,7 @@ performChecks() {
 
 # re-implement realpath for OS X (thanks mschrag)
 # https://superuser.com/questions/205127/
-if ! $(command -v realpath > /dev/null); then
+if ! cmdExists realpath; then
     realpath() {
         pushd . > /dev/null
         if [ -d "$1" ]; then
@@ -511,6 +523,195 @@ merge() {
     logInfo "Don't forget to also push the tags using \e[1mgit push --tags\e[0m."
 }
 
+# -----------------------------------------------------------------------
+#                         appimage command
+# -----------------------------------------------------------------------
+appimage() {
+    local appdir
+    local build_appsign=false
+    local build_key
+    local verbosity="1"
+
+    while [ $# -ge 1 ]; do
+        local arg="$1"
+        case "$arg" in
+            -v|--version)
+                RELEASE_NAME="$2"
+                shift ;;
+
+            -a|--appdir)
+                appdir="$2"
+                shift ;;
+
+            -o|--output-dir)
+                OUTPUT_DIR="$2"
+                shift ;;
+
+            -d|--docker-image)
+                DOCKER_IMAGE="$2"
+                shift ;;
+
+            --container-name)
+                DOCKER_CONTAINER_NAME="$2"
+                shift ;;
+
+            --appsign)
+                build_appsign=true ;;
+
+            --verbosity)
+                verbosity=$2
+                shift ;;
+
+            -k|--key)
+                build_key="$2"
+                shift ;;
+
+            -h|--help)
+                printUsage "appimage"
+                exit ;;
+
+            *)
+                logError "Unknown option '$arg'\n"
+                printUsage "appimage"
+                exit 1 ;;
+        esac
+        shift
+    done
+
+    if [ -z "${appdir}" ]; then
+        logError "Missing arguments, --appdir is required!\n"
+        printUsage "appimage"
+        exit 1
+    fi
+
+    if [ ! -d "${appdir}" ]; then
+        logError "AppDir does not exist, please create one with 'make install'!\n"
+        exit 1
+    elif [ -e "${appdir}/AppRun" ]; then
+        logError "AppDir has already been run through linuxdeploy, please create a fresh AppDir with 'make install'.\n"
+        exit 1
+    fi
+
+    appdir="$(realpath "$appdir")"
+
+    local out="${OUTPUT_DIR}"
+    if [ "" == "$out" ]; then
+        out="."
+    fi
+    mkdir -p "$out"
+    local out_real="$(realpath "$out")"
+    cd "$out"
+
+    local linuxdeploy="linuxdeploy"
+    local linuxdeploy_cleanup
+    local linuxdeploy_plugin_qt="linuxdeploy-plugin-qt"
+    local linuxdeploy_plugin_qt_cleanup
+    local appimagetool="appimagetool"
+    local appimagetool_cleanup
+
+    logInfo "Testing for AppImage tools..."
+    local docker_test_cmd
+    if [ "" != "$DOCKER_IMAGE" ]; then
+        docker_test_cmd="docker run --rm ${DOCKER_IMAGE}"
+    fi
+
+    # Test if linuxdeploy and linuxdeploy-plugin-qt are installed
+    # on the system or inside the Docker container
+    if ! ${docker_test_cmd} which ${linuxdeploy} &> /dev/null; then
+        logInfo "Downloading linuxdeploy..."
+        linuxdeploy="./linuxdeploy"
+        linuxdeploy_cleanup="rm -f ${linuxdeploy}"
+        curl -L "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage" > "$linuxdeploy"
+        chmod +x "$linuxdeploy"
+    fi
+    if ! ${docker_test_cmd} which ${linuxdeploy_plugin_qt} &> /dev/null; then
+        logInfo "Downloading linuxdeploy-plugin-qt..."
+        linuxdeploy_plugin_qt="./linuxdeploy-plugin-qt"
+        linuxdeploy_plugin_qt_cleanup="rm -f ${linuxdeploy_plugin_qt}"
+        curl -L "https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage" > "$linuxdeploy_plugin_qt"
+        chmod +x "$linuxdeploy_plugin_qt"
+    fi
+
+    # appimagetool is always run outside a Docker container, so we can access our GPG keys
+    if ! cmdExists ${appimagetool}; then
+        logInfo "Downloading appimagetool..."
+        appimagetool="./appimagetool"
+        appimagetool_cleanup="rm -f ${appimagetool}"
+        curl -L "https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage" > "$appimagetool"
+        chmod +x "$appimagetool"
+    fi
+
+    # Create custom AppRun wrapper
+    cat << EOF > "${out_real}/KeePassXC-AppRun"
+#!/usr/bin/env bash
+
+export PATH="\$(dirname \$0)/usr/bin:\${PATH}"
+export LD_LIBRARY_PATH="\$(dirname \$0)/usr/lib:\${LD_LIBRARY_PATH}"
+
+if [ "\${1}" == "cli" ]; then
+    shift
+    exec keepassxc-cli "\$@"
+elif [ "\${1}" == "proxy" ]; then
+    shift
+    exec keepassxc-proxy "\$@"
+elif [ -v CHROME_WRAPPER ] || [ -v MOZ_LAUNCHED_CHILD ]; then
+    exec keepassxc-proxy "\$@"
+else
+    exec keepassxc "\$@"
+fi
+EOF
+    chmod +x "${out_real}/KeePassXC-AppRun"
+
+    # Find .desktop files, icons, and binaries to deploy
+    local desktop_file="$(find "$appdir" -name "org.keepassxc.KeePassXC.desktop" | head -n1)"
+    local icon="$(find "$appdir" -name 'keepassxc.png' | grep -P 'application/256x256/apps/keepassxc.png$' | head -n1)"
+    local executables="$(IFS=$'\n' find "$appdir" | grep -P '/usr/bin/keepassxc[^/]*$' | xargs -i printf " --executable={}")"
+
+    logInfo "Collecting libs and patching binaries..."
+    if [ "" == "$DOCKER_IMAGE" ]; then
+        "$linuxdeploy" --verbosity=${verbosity} --plugin=qt --appdir="$appdir" --desktop-file="$desktop_file" \
+        --custom-apprun="${out_real}/KeePassXC-AppRun" --icon-file="$icon" ${executables} \
+        --library=$(ldconfig -p | grep x86-64 | grep -oP '/[^\s]+/libgpg-error\.so\.\d+$' | head -n1)
+    else
+        desktop_file="${desktop_file//${appdir}/\/keepassxc\/AppDir}"
+        icon="${icon//${appdir}/\/keepassxc\/AppDir}"
+        executables="${executables//${appdir}/\/keepassxc\/AppDir}"
+
+        docker run --name "$DOCKER_CONTAINER_NAME" --rm \
+            --cap-add SYS_ADMIN --security-opt apparmor:unconfined --device /dev/fuse \
+            -v "${appdir}:/keepassxc/AppDir:rw" \
+            -v "${out_real}:/keepassxc/out:rw" \
+            "$DOCKER_IMAGE" \
+            bash -c "cd /keepassxc/out && ${linuxdeploy} --verbosity=${verbosity} --plugin=qt --appdir=/keepassxc/AppDir \
+            --custom-apprun="/keepassxc/out/KeePassXC-AppRun" --desktop-file=${desktop_file} --icon-file=${icon} ${executables} \
+            --library=\$(ldconfig -p | grep x86-64 | grep -oP '/[^\s]+/libgpg-error\.so\.\d+$' | head -n1)"
+    fi
+
+    logInfo "Creating AppImage..."
+    local appsign_flag=""
+    local appsign_key_flag=""
+    if ${build_appsign}; then
+        appsign_flag="--sign"
+        appsign_key_flag="--sign-key ${build_key}"
+    fi
+    local appimage_name="KeePassXC-x86_64.AppImage"
+    if [ "" != "$RELEASE_NAME" ]; then
+        appimage_name="KeePassXC-${RELEASE_NAME}-x86_64.AppImage"
+    fi
+
+    # Run appimagetool to package (and possibly sign) AppImage
+    # --no-appstream is required, since it may crash on newer systems
+    # see: https://github.com/AppImage/AppImageKit/issues/856
+    "$appimagetool" --updateinformation "gh-releases-zsync|keepassxreboot|keepassxc|latest|KeePassXC-*-x86_64.AppImage.zsync" \
+        ${appsign_flag} ${appsign_key_flag} --no-appstream "$appdir" "${out_real}/${appimage_name}"
+
+    logInfo "Cleaning up temporary files..."
+    ${linuxdeploy_cleanup}
+    ${linuxdeploy_plugin_qt_cleanup}
+    ${appimagetool_cleanup}
+    rm -f "${out_real}/KeePassXC-AppRun"
+}
+
 # -----------------------------------------------------------------------
 #                             build command
 # -----------------------------------------------------------------------
@@ -518,6 +719,7 @@ build() {
     local build_source_tarball=true
     local build_snapshot=false
     local build_snapcraft=false
+    local build_appimage=false
     local build_generators=""
     local build_appsign=false
     local build_key=""
@@ -549,6 +751,10 @@ build() {
                 DOCKER_IMAGE="$2"
                 shift ;;
 
+            --container-name)
+                DOCKER_CONTAINER_NAME="$2"
+                shift ;;
+
             --appsign)
                 build_appsign=true ;;
 
@@ -556,13 +762,12 @@ build() {
                 build_key="$2"
                 shift ;;
 
-            --container-name)
-                DOCKER_CONTAINER_NAME="$2"
-                shift ;;
-                
             --snapcraft)
                 build_snapcraft=true ;;
 
+            --appimage)
+                build_appimage=true ;;
+
             -c|--cmake-options)
                 CMAKE_OPTIONS="$2"
                 shift ;;
@@ -605,6 +810,10 @@ build() {
         shift
     done
 
+    if [[ ${build_appsign} && ! -f ${build_key} ]]; then
+        exitError "--appsign specified with invalid key file\n"
+    fi
+
     init
 
     OUTPUT_DIR="$(realpath "$OUTPUT_DIR")"
@@ -671,6 +880,11 @@ build() {
     for p in ${BUILD_PLUGINS}; do
         CMAKE_OPTIONS="${CMAKE_OPTIONS} -DWITH_XC_$(echo $p | tr '[:lower:]' '[:upper:]')=On"
     done
+    if [ "$(uname -o)" == "GNU/Linux" ] && ${build_appimage}; then
+        CMAKE_OPTIONS="${CMAKE_OPTIONS} -DKEEPASSXC_DIST_TYPE=AppImage"
+        # linuxdeploy requires /usr as install prefix
+        INSTALL_PREFIX="/usr"
+    fi
 
     if [ "$COMPILER" == "g++" ]; then
         export CC=gcc
@@ -693,6 +907,12 @@ build() {
             logInfo "Compiling and packaging sources..."
             make ${MAKE_OPTIONS} package
 
+            # Appsign the executables if desired
+            if [[ ${build_appsign} ]]; then
+                logInfo "Signing executable files"
+                appsign "-f" "./${APP_NAME}-${RELEASE_NAME}.dmg" "-k" "${build_key}"
+            fi
+
             mv "./${APP_NAME}-${RELEASE_NAME}.dmg" ../
         elif [ "$(uname -o)" == "Msys" ]; then
             # Building on Windows with Msys2
@@ -704,9 +924,9 @@ build() {
             mingw32-make ${MAKE_OPTIONS} preinstall
 
             # Appsign the executables if desired
-            if [[ ${build_appsign} && ! -z ${build_key} ]]; then
+            if [[ ${build_appsign} ]]; then
                 logInfo "Signing executable files"
-                appsign "-f" `find src | grep '\.exe'` "-k" "${build_key}"
+                appsign "-f" $(find src | grep -P '\.exe$|\.dll$') "-k" "${build_key}"
             fi
 
             # Call cpack directly instead of calling make package.
@@ -717,7 +937,7 @@ build() {
             # Inject the portable config into the zip build and rename
             for filename in ${APP_NAME}-*.zip; do
                 logInfo "Creating portable zip file"
-                local folder=`echo ${filename} | sed -r 's/(.*)\.zip/\1/'`
+                local folder=$(echo ${filename} | sed -r 's/(.*)\.zip/\1/')
                 python -c 'import zipfile,sys ; zipfile.ZipFile(sys.argv[1],"a").write(sys.argv[2],sys.argv[3])' \
                     ${filename} ${SRC_DIR}/share/keepassxc.ini ${folder}/keepassxc.ini
                 mv ${filename} ${folder}-portable.zip
@@ -725,25 +945,21 @@ build() {
 
             mv "${APP_NAME}-"*.* ../
         else
-            mkdir -p "${OUTPUT_DIR}/bin-release"
+            mkdir -p "${OUTPUT_DIR}/KeePassXC.AppDir"
 
             # Building on Linux without Docker container
             logInfo "Configuring build..."
             cmake -DCMAKE_BUILD_TYPE=Release -DWITH_TESTS=Off ${CMAKE_OPTIONS} \
-                -DCMAKE_INSTALL_PREFIX="${INSTALL_PREFIX}" \
+                -DCMAKE_INSTALL_PREFIX="${INSTALL_PREFIX}" "$SRC_DIR"
-                -DKEEPASSXC_DIST_TYPE=AppImage "$SRC_DIR"
 
             logInfo "Compiling sources..."
-            make $MAKE_OPTIONS
+            make ${MAKE_OPTIONS}
 
             logInfo "Installing to bin dir..."
-            make DESTDIR="${OUTPUT_DIR}/bin-release" install/strip
+            make DESTDIR="${OUTPUT_DIR}/KeePassXC.AppDir" install/strip
-            
-            logInfo "Creating AppImage..."
-            ${SRC_DIR}/AppImage-Recipe.sh "$APP_NAME" "$RELEASE_NAME"
         fi
     else
-        if [ build_snapcraft ]; then
+        if ${build_snapcraft}; then
             logInfo "Building snapcraft docker image..."
 
             sudo docker image build -t "$DOCKER_IMAGE" "$(realpath "$SRC_DIR")/ci/snapcraft"
@@ -754,7 +970,7 @@ build() {
                 -v "$(realpath "$SRC_DIR"):/keepassxc" -w "/keepassxc" \
                 "$DOCKER_IMAGE" snapcraft
         else
-            mkdir -p "${OUTPUT_DIR}/bin-release"
+            mkdir -p "${OUTPUT_DIR}/KeePassXC.AppDir"
 
             logInfo "Launching Docker container to compile sources..."
 
@@ -765,11 +981,9 @@ build() {
                 -v "$(realpath "$OUTPUT_DIR"):/keepassxc/out:rw" \
                 "$DOCKER_IMAGE" \
                 bash -c "cd /keepassxc/out/build-release && \
-                    cmake -DCMAKE_BUILD_TYPE=Release -DWITH_TESTS=Off $CMAKE_OPTIONS \
+                    cmake -DCMAKE_BUILD_TYPE=Release -DWITH_TESTS=Off ${CMAKE_OPTIONS} \
-                        -DCMAKE_INSTALL_PREFIX=\"${INSTALL_PREFIX}\" \
+                        -DCMAKE_INSTALL_PREFIX=${INSTALL_PREFIX} /keepassxc/src && \
-                        -DKEEPASSXC_DIST_TYPE=AppImage /keepassxc/src && \
+                    make ${MAKE_OPTIONS} && make DESTDIR=/keepassxc/out/KeePassXC.AppDir install/strip"
-                    make $MAKE_OPTIONS && make DESTDIR=/keepassxc/out/bin-release install/strip && \
-                    /keepassxc/src/AppImage-Recipe.sh "$APP_NAME" "$RELEASE_NAME""
         fi
 
         if [ 0 -ne $? ]; then
@@ -779,12 +993,28 @@ build() {
         logInfo "Build finished, Docker container terminated."
     fi
 
+    if [ "$(uname -o)" == "GNU/Linux" ] && ${build_appimage}; then
+        local appsign_flag=""
+        local appsign_key_flag=""
+        local docker_image_flag=""
+        local docker_container_name_flag=""
+        if ${build_appsign}; then
+            appsign_flag="--appsign"
+            appsign_key_flag="-k ${build_key}"
+        fi
+        if [ "" != "${DOCKER_IMAGE}" ]; then
+            docker_image_flag="-d ${DOCKER_IMAGE}"
+            docker_container_name_flag="--container-name ${DOCKER_CONTAINER_NAME}"
+        fi
+        appimage "-a" "${OUTPUT_DIR}/KeePassXC.AppDir" "-o" "${OUTPUT_DIR}" \
+            ${appsign_flag} ${appsign_key_flag} ${docker_image_flag} ${docker_container_name_flag}
+    fi
+
     cleanup
 
     logInfo "All done!"
 }
 
-
 # -----------------------------------------------------------------------
 #                           gpgsign command
 # -----------------------------------------------------------------------
@@ -843,8 +1073,6 @@ gpgsign() {
     logInfo "All done!"
 }
 
-
-
 # -----------------------------------------------------------------------
 #                           appsign command
 # -----------------------------------------------------------------------
@@ -915,7 +1143,7 @@ appsign() {
                 fi
 
                 logInfo "Signing app using codesign..."
-                codesign --sign "${key}" --verbose --deep ./app/KeePassXC.app
+                codesign --sign "${key}" --verbose --deep --entitlements ${orig_dir}/share/macosx/keepassxc.entitlements ./app/KeePassXC.app
 
                 if [ 0 -ne $? ]; then
                     cd "${orig_dir}"
@@ -940,8 +1168,6 @@ appsign() {
         done
 
     elif [ "$(uname -o)" == "Msys" ]; then
-        checkOsslsigncodeCommandExists
-
         if [[ ! -f "${key}" ]]; then
             exitError "Key file was not found!"
         fi
@@ -950,20 +1176,8 @@ appsign() {
         echo
 
         for f in "${sign_files[@]}"; do
-            if [[ ${f: -4} == ".exe" ]]; then
+            ext=${f: -4}
-                logInfo "Signing file '${f}' using osslsigncode..."
+            if [[ $ext == ".msi" || $ext == ".exe" || $ext == ".dll" ]]; then
-                # output a signed exe; we have to use a different name due to osslsigntool limitations
-                osslsigncode sign -pkcs12 "${key}" -pass "${password}" -n "KeePassXC" \
-                    -t "http://timestamp.comodoca.com/authenticode" -in "${f}" -out "${f}.signed"
-
-                if [ 0 -ne $? ]; then
-                    rm -f "${f}.signed"
-                    exitError "Signing failed!"
-                fi
-
-                # overwrite the original exe with the signed exe
-                mv -f "${f}.signed" "${f}"
-            elif [[ ${f: -4} == ".msi" ]]; then
                 # Make sure we can find the signtool
                 checkSigntoolCommandExists
 
@@ -987,7 +1201,6 @@ appsign() {
     logInfo "All done!"
 }
 
-
 # -----------------------------------------------------------------------
 #                       parse global command line
 # -----------------------------------------------------------------------
@@ -1000,7 +1213,8 @@ if [ "" == "$MODE" ]; then
 elif [ "help" == "$MODE" ]; then
     printUsage "$1"
     exit
-elif [ "check" == "$MODE" ] || [ "merge" == "$MODE" ] || [ "build" == "$MODE" ] || [ "gpgsign" == "$MODE" ] || [ "appsign" == "$MODE" ]; then
+elif [ "check" == "$MODE" ] || [ "merge" == "$MODE" ] || [ "build" == "$MODE" ] \
+    || [ "gpgsign" == "$MODE" ] || [ "appsign" == "$MODE" ] || [ "appimage" == "$MODE" ]; then
     ${MODE} "$@"
 else
     printUsage "$MODE"

share/CMakeLists.txt

@@ -25,10 +25,10 @@ install(FILES ${DATABASE_ICONS} DESTINATION ${DATA_INSTALL_DIR}/icons/database)
 
 if(UNIX AND NOT APPLE)
     install(DIRECTORY icons/application/ DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor
-            FILES_MATCHING PATTERN "keepassx*.png" PATTERN "keepassx*.svgz"
+            FILES_MATCHING PATTERN "keepassx*.png" PATTERN "keepassx*.svg"
             PATTERN "status" EXCLUDE PATTERN "actions" EXCLUDE PATTERN "categories" EXCLUDE)
     install(DIRECTORY icons/application/ DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor
-            FILES_MATCHING PATTERN "application-x-keepassxc.png" PATTERN "application-x-keepassxc.svgz"
+            FILES_MATCHING PATTERN "application-x-keepassxc.png" PATTERN "application-x-keepassxc.svg"
             PATTERN "status" EXCLUDE PATTERN "actions" EXCLUDE PATTERN "categories" EXCLUDE)
     install(FILES linux/org.keepassxc.KeePassXC.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
     install(FILES linux/org.keepassxc.KeePassXC.appdata.xml DESTINATION ${CMAKE_INSTALL_DATADIR}/metainfo)
@@ -39,85 +39,90 @@ if(APPLE)
   install(FILES macosx/keepassxc.icns DESTINATION ${DATA_INSTALL_DIR})
 endif()
 
+install(DIRECTORY wizard/ DESTINATION ${DATA_INSTALL_DIR}/wizard FILES_MATCHING PATTERN "*.png")
+
 install(DIRECTORY icons/application/ DESTINATION ${DATA_INSTALL_DIR}/icons/application
-        FILES_MATCHING PATTERN "*.png" PATTERN "*.svgz")
+        FILES_MATCHING PATTERN "*.png" PATTERN "*.svg")
 
 add_custom_target(icons
-                  # SVGZ to PNGs for KeePassXC
+    # SVG to PNGs for KeePassXC
     COMMAND inkscape -z -w 16 -h 16
-                    icons/application/scalable/apps/keepassxc.svgz -e icons/application/16x16/apps/keepassxc.png
+        icons/application/scalable/apps/keepassxc.svg -e icons/application/16x16/apps/keepassxc.png
     COMMAND inkscape -z -w  24 -h 24
-                    icons/application/scalable/apps/keepassxc.svgz -e icons/application/24x24/apps/keepassxc.png
+        icons/application/scalable/apps/keepassxc.svg -e icons/application/24x24/apps/keepassxc.png
     COMMAND inkscape -z -w  32 -h 32
-                    icons/application/scalable/apps/keepassxc.svgz -e icons/application/32x32/apps/keepassxc.png
+        icons/application/scalable/apps/keepassxc.svg -e icons/application/32x32/apps/keepassxc.png
     COMMAND inkscape -z -w 48 -h 48
-                    icons/application/scalable/apps/keepassxc.svgz -e icons/application/48x48/apps/keepassxc.png
+        icons/application/scalable/apps/keepassxc.svg -e icons/application/48x48/apps/keepassxc.png
     COMMAND inkscape -z -w 64 -h 64
-                    icons/application/scalable/apps/keepassxc.svgz -e icons/application/64x64/apps/keepassxc.png
+        icons/application/scalable/apps/keepassxc.svg -e icons/application/64x64/apps/keepassxc.png
     COMMAND inkscape -z -w 128 -h 128
-                    icons/application/scalable/apps/keepassxc.svgz -e icons/application/128x128/apps/keepassxc.png
+        icons/application/scalable/apps/keepassxc.svg -e icons/application/128x128/apps/keepassxc.png
     COMMAND inkscape -z -w 256 -h 256
-                    icons/application/scalable/apps/keepassxc.svgz -e icons/application/256x256/apps/keepassxc.png
+        icons/application/scalable/apps/keepassxc.svg -e icons/application/256x256/apps/keepassxc.png
 
-                  # SVGZ to PNGs for KeePassXC
+    # SVG to PNGs for KeePassXC
     COMMAND inkscape -z -w 16 -h 16
-                    icons/application/scalable/apps/keepassxc-dark.svgz -e icons/application/16x16/apps/keepassxc-dark.png
+        icons/application/scalable/apps/keepassxc-dark.svg -e icons/application/16x16/apps/keepassxc-dark.png
     COMMAND inkscape -z -w  24 -h 24
-                    icons/application/scalable/apps/keepassxc-dark.svgz -e icons/application/24x24/apps/keepassxc-dark.png
+        icons/application/scalable/apps/keepassxc-dark.svg -e icons/application/24x24/apps/keepassxc-dark.png
     COMMAND inkscape -z -w  32 -h 32
-                    icons/application/scalable/apps/keepassxc-dark.svgz -e icons/application/32x32/apps/keepassxc-dark.png
+        icons/application/scalable/apps/keepassxc-dark.svg -e icons/application/32x32/apps/keepassxc-dark.png
     COMMAND inkscape -z -w 48 -h 48
-                    icons/application/scalable/apps/keepassxc-dark.svgz -e icons/application/48x48/apps/keepassxc-dark.png
+        icons/application/scalable/apps/keepassxc-dark.svg -e icons/application/48x48/apps/keepassxc-dark.png
     COMMAND inkscape -z -w 64 -h 64
-                    icons/application/scalable/apps/keepassxc-dark.svgz -e icons/application/64x64/apps/keepassxc-dark.png
+        icons/application/scalable/apps/keepassxc-dark.svg -e icons/application/64x64/apps/keepassxc-dark.png
     COMMAND inkscape -z -w 128 -h 128
-                    icons/application/scalable/apps/keepassxc-dark.svgz -e icons/application/128x128/apps/keepassxc-dark.png
+        icons/application/scalable/apps/keepassxc-dark.svg -e icons/application/128x128/apps/keepassxc-dark.png
     COMMAND inkscape -z -w 256 -h 256
-                    icons/application/scalable/apps/keepassxc-dark.svgz -e icons/application/256x256/apps/keepassxc-dark.png
+        icons/application/scalable/apps/keepassxc-dark.svg -e icons/application/256x256/apps/keepassxc-dark.png
 
-                  # SVGZ to PNGs for KeePassXC
+    # SVG to PNGs for KeePassXC
     COMMAND inkscape -z -w 16 -h 16
-                    icons/application/scalable/apps/keepassxc-locked.svgz -e icons/application/16x16/apps/keepassxc-locked.png
+        icons/application/scalable/apps/keepassxc-locked.svg -e icons/application/16x16/apps/keepassxc-locked.png
     COMMAND inkscape -z -w  24 -h 24
-                    icons/application/scalable/apps/keepassxc-locked.svgz -e icons/application/24x24/apps/keepassxc-locked.png
+        icons/application/scalable/apps/keepassxc-locked.svg -e icons/application/24x24/apps/keepassxc-locked.png
     COMMAND inkscape -z -w  32 -h 32
-                    icons/application/scalable/apps/keepassxc-locked.svgz -e icons/application/32x32/apps/keepassxc-locked.png
+        icons/application/scalable/apps/keepassxc-locked.svg -e icons/application/32x32/apps/keepassxc-locked.png
     COMMAND inkscape -z -w 48 -h 48
-                    icons/application/scalable/apps/keepassxc-locked.svgz -e icons/application/48x48/apps/keepassxc-locked.png
+        icons/application/scalable/apps/keepassxc-locked.svg -e icons/application/48x48/apps/keepassxc-locked.png
     COMMAND inkscape -z -w 64 -h 64
-                    icons/application/scalable/apps/keepassxc-locked.svgz -e icons/application/64x64/apps/keepassxc-locked.png
+        icons/application/scalable/apps/keepassxc-locked.svg -e icons/application/64x64/apps/keepassxc-locked.png
     COMMAND inkscape -z -w 128 -h 128
-                    icons/application/scalable/apps/keepassxc-locked.svgz -e icons/application/128x128/apps/keepassxc-locked.png
+        icons/application/scalable/apps/keepassxc-locked.svg -e icons/application/128x128/apps/keepassxc-locked.png
     COMMAND inkscape -z -w 256 -h 256
-                    icons/application/scalable/apps/keepassxc-locked.svgz -e icons/application/256x256/apps/keepassxc-locked.png
+        icons/application/scalable/apps/keepassxc-locked.svg -e icons/application/256x256/apps/keepassxc-locked.png
 
-                  # SVGZ to PNGs for KeePassXC
+    # SVG to PNGs for KeePassXC
     COMMAND inkscape -z -w 16 -h 16
-                    icons/application/scalable/apps/keepassxc-unlocked.svgz -e icons/application/16x16/apps/keepassxc-unlocked.png
+        icons/application/scalable/apps/keepassxc-unlocked.svg -e icons/application/16x16/apps/keepassxc-unlocked.png
     COMMAND inkscape -z -w  24 -h 24
-                    icons/application/scalable/apps/keepassxc-unlocked.svgz -e icons/application/24x24/apps/keepassxc-unlocked.png
+        icons/application/scalable/apps/keepassxc-unlocked.svg -e icons/application/24x24/apps/keepassxc-unlocked.png
     COMMAND inkscape -z -w  32 -h 32
-                    icons/application/scalable/apps/keepassxc-unlocked.svgz -e icons/application/32x32/apps/keepassxc-unlocked.png
+        icons/application/scalable/apps/keepassxc-unlocked.svg -e icons/application/32x32/apps/keepassxc-unlocked.png
     COMMAND inkscape -z -w 48 -h 48
-                    icons/application/scalable/apps/keepassxc-unlocked.svgz -e icons/application/48x48/apps/keepassxc-unlocked.png
+        icons/application/scalable/apps/keepassxc-unlocked.svg -e icons/application/48x48/apps/keepassxc-unlocked.png
     COMMAND inkscape -z -w 64 -h 64
-                    icons/application/scalable/apps/keepassxc-unlocked.svgz -e icons/application/64x64/apps/keepassxc-unlocked.png
+        icons/application/scalable/apps/keepassxc-unlocked.svg -e icons/application/64x64/apps/keepassxc-unlocked.png
     COMMAND inkscape -z -w 128 -h 128
-                    icons/application/scalable/apps/keepassxc-unlocked.svgz -e icons/application/128x128/apps/keepassxc-unlocked.png
+        icons/application/scalable/apps/keepassxc-unlocked.svg -e icons/application/128x128/apps/keepassxc-unlocked.png
     COMMAND inkscape -z -w 256 -h 256
-                    icons/application/scalable/apps/keepassxc-unlocked.svgz -e icons/application/256x256/apps/keepassxc-unlocked.png
+        icons/application/scalable/apps/keepassxc-unlocked.svg -e icons/application/256x256/apps/keepassxc-unlocked.png
 
-                  # SVGZ to PNGs for KeePassXC MIME-Type
+    # SVG to PNGs for KeePassXC MIME-Type
     COMMAND inkscape -z -w 16 -h 16
-                    icons/application/scalable/mimetypes/application-x-keepassxc.svgz -e icons/application/16x16/mimetypes/application-x-keepassxc.png
+        icons/application/scalable/mimetypes/application-x-keepassxc.svg -e icons/application/16x16/mimetypes/application-x-keepassxc.png
     COMMAND inkscape -z -w 22 -h 22
-                    icons/application/scalable/mimetypes/application-x-keepassxc.svgz -e icons/application/22x22/mimetypes/application-x-keepassxc.png
+        icons/application/scalable/mimetypes/application-x-keepassxc.svg -e icons/application/22x22/mimetypes/application-x-keepassxc.png
     COMMAND inkscape -z -w 32 -h 32
-                    icons/application/scalable/mimetypes/application-x-keepassxc.svgz -e icons/application/32x32/mimetypes/application-x-keepassxc.png
+        icons/application/scalable/mimetypes/application-x-keepassxc.svg -e icons/application/32x32/mimetypes/application-x-keepassxc.png
     COMMAND inkscape -z -w 64 -h 64
-                    icons/application/scalable/mimetypes/application-x-keepassxc.svgz -e icons/application/64x64/mimetypes/application-x-keepassxc.png
+        icons/application/scalable/mimetypes/application-x-keepassxc.svg -e icons/application/64x64/mimetypes/application-x-keepassxc.png
     COMMAND inkscape -z -w 128 -h 128
-                    icons/application/scalable/mimetypes/application-x-keepassxc.svgz -e icons/application/128x128/mimetypes/application-x-keepassxc.png
+        icons/application/scalable/mimetypes/application-x-keepassxc.svg -e icons/application/128x128/mimetypes/application-x-keepassxc.png
+
+    # Shrink PNGs using pngcrush
+    COMMAND bash ./crushpng.sh icons
 
     # ICNS for MacOS
     COMMAND png2icns macosx/keepassxc.icns
@@ -128,13 +133,8 @@ add_custom_target(icons
         icons/application/256x256/apps/keepassxc.png
 
     # ICO for Windows
-                  COMMAND icotool -c -o windows/keepassxc.ico
+    COMMAND bash ./windows/create-ico.sh icons/application/scalable/apps/keepassxc.svg windows/keepassxc.ico
-                    icons/application/16x16/apps/keepassxc.png
+    COMMAND bash ./windows/create-ico.sh icons/application/scalable/mimetypes/application-x-keepassxc.svg windows/keepassxc-kdbx.ico
-                    icons/application/24x24/apps/keepassxc.png
+
-                    icons/application/32x32/apps/keepassxc.png
-                    icons/application/48x48/apps/keepassxc.png
-                    icons/application/64x64/apps/keepassxc.png
-                    icons/application/128x128/apps/keepassxc.png
-                    icons/application/256x256/apps/keepassxc.png
     VERBATIM
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})

share/about-contributors.html

@@ -1,54 +0,0 @@
-<h3>VIP Patreon Supporters:</h3>
-<ul>
-  <li>John Cook</li>
-  <li>Max Anderson</li>
-</ul>
-<h3>Notable Code Contributions:</h3>
-<ul>
-  <li>droidmonkey</li>
-  <li>phoerious</li>
-  <li>TheZ3ro</li>
-  <li>louib</li>
-  <li>weslly</li>
-  <li>varjolintu (KeePassXC-Browser)</li>
-  <li>hifi (SSH Agent)</li>
-  <li>frostasm</li>
-  <li>fonic (Entry Table View)</li>
-  <li>kylemanna (YubiKey)</li>
-  <li>keithbennett (KeePassHTTP)</li>
-  <li>Typz (KeePassHTTP)</li>
-  <li>denk-mal (KeePassHTTP)</li>
-  <li>angelsl (KDBX 4)</li>
-  <li>seatedscribe (CSV Import)</li>
-  <li>debfx (KeePassX)</li>
-  <li>BlueIce (KeePassX)</li>
-</ul>
-<h3>Patreon Supporters:</h3>
-<ul>
-  <li>Ashura</li>
-  <li>Alexanderjb</li>
-  <li>Andreas Kollmann</li>
-  <li>Richard Ames</li>
-</ul>
-<h3>Translations:</h3>
-<ul>
-  <li><strong>Basque</strong>: azken_tximinoa, Hey_neken</li>
-  <li><strong>Catalan</strong>: capitantrueno, dsoms, mcus, raulua, ZJaume</li>
-  <li><strong>Chinese (China)</strong>: Biggulu, Brandon_c, hoilc, ligyxy, vc5, Small_Ku</li>
-  <li><strong>Chinese (Taiwan)</strong>: BestSteve, MiauLightouch, Small_Ku, yan12125, ymhuang0808</li>
-  <li><strong>Czech</strong>: DanielMilde, JosefVitu, pavelb, tpavelek</li>
-  <li><strong>Danish</strong>: nlkl</li>
-  <li><strong>Dutch</strong>: apie, bartlibert, evanoosten, fvw, KnooL, srgvg, Vistaus, wanderingidea</li>
-  <li><strong>Finnish</strong>: artnay, Jarppi, MawKKe</li>
-  <li><strong>French</strong>: A1RO, aghilas.messara, bisaloo, frgnca, ggtr1138, gilbsgilbs, gtalbot, Gui13, iannick, jlutran, kyodev, logut, MartialBis, narzb, pBouillon, plunkets, Raphi111, Scrat15, tl_pierre, wilfriedroset</li>
-  <li><strong>German</strong>: antsas, BasicBaer, Calyrx, codejunky, DavidHamburg, eth0, for1real, jensrutschmann, joe776, kflesch, MarcEdinger, marcbone, mcliquid, mfernau77, montilo, nursoda, omnisome4, origin_de, pcrcoding, phoerious, rgloor, transi_222, vlenzer, waster</li>
-  <li><strong>Greek</strong>: magkopian, nplatis, tassos.b, xinomilo</li>
-  <li><strong>Hungarian</strong>: bubu, meskobalazs, urbalazs</li>
-  <li><strong>Indonesian</strong>: zk</li>
-  <li><strong>Italian</strong>: amaxis, bovirus, duncanmid, FranzMari, lucaim, Mte90, Peo, TheZ3ro, tosky, VosaxAlo</li>
-  <li><strong>Japanese</strong>: masoo, metalic_cat, p2635, Shinichirou_Yamada, vargas.peniel, vmemjp, yukinakato</li>
-  <li><strong>Korean</strong>: cancantun, peremen</li>
-  <li><strong>Lithuanian</strong>: Moo</li>
-  <li><strong>Polish</strong>: keypress, konradmb, mrerexx, psobczak</li>
-  <li><strong>Portuguese (Brazil)</strong>: danielbibit, fabiom, flaviobn, vitor895, weslly</li>
-</ul>

share/about.html

@@ -1,14 +0,0 @@
-<p>Website: <a href="https://keepassxc.org/" style="text-decoration: underline">https://keepassxc.org</a></p>
-<p>Report bugs at: <a href="https://github.com/keepassxreboot/keepassxc/issues">https://github.com</a></p>
-<p>KeePassXC is distributed under the terms of the GNU General Public License (GPL) version 2 or (at your option) version 3.</p>
-<h3>Project Maintainers:</h3>
-<ul>
-    <li>Jonathan White (<a href="https://github.com/droidmonkey">droidmonkey</a>)</li>
-    <li>Janek Bevendorff (<a href="https://github.com/phoerious">phoerious</a>)</li>
-    <li><a href="https://github.com/TheZ3ro">TheZ3ro</a></li>
-    <li>Louis-Bertrand (<a href="https://github.com/louib">louib</a>)</li>
-    <li>Weslly Honorato (<a href="https://github.com/weslly">weslly</a>)</li>
-    <li>Toni Spets (<a href="https://github.com/hifi">hifi</a>)</li>
-    <li>Sami V&auml;nttinen (<a href="https://github.com/varjolintu">varjolintu</a>)</li>
-</ul>
-<p>Special thanks from the KeePassXC team go to <a href="https://github.com/debfx">debfx</a> for creating the original KeePassX.</p>

share/crushpng.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+if [[ -z $1 ]]; then
+  echo "You must supply a root folder!"
+  exit 1
+fi
+
+find "$1" -iname '*png' -exec pngcrush -ow -brute {} \;