diff options
| author | Jonathan White <support@dmapps.us> | 2017-12-12 05:01:14 +0300 |
|---|---|---|
| committer | Jonathan White <support@dmapps.us> | 2017-12-12 05:01:14 +0300 |
| commit | cf94610f46eaf77e0c1dc9e6abc5fea3e0d00f49 (patch) | |
| tree | 9fb8afbcc17bf9f2299eb0be6e33415a7a7edb45 | |
| parent | 6d46717cfc2d61bfc6a5335b02e95c6b1d9bf482 (diff) | |
| parent | c7836f11578a85f61a49bcdb35ae442046778dd1 (diff) | |
Release 2.2.32.2.3
- Prevent database corruption when locked [#1219]
- Fixes apply button not saving new entries [#1141]
- Switch to Consolas font on Windows for password edit [#1229]
- Multiple fixes to AppImage deployment [#1115, #1228]
- Fixes multiple memory leaks [#1213]
- Resize message close to 16x16 pixels [#1253]
36 files changed, 404 insertions, 372 deletions
diff --git a/.travis.yml b/.travis.yml index df7f8ed58..942bb426d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,8 +15,8 @@ compiler: - gcc env: - - CONFIG=Release ASAN_OPTIONS=detect_odr_violation=1:leak_check_at_exit=0 - - CONFIG=Debug ASAN_OPTIONS=detect_odr_violation=1:leak_check_at_exit=0 + - CONFIG=Release ASAN_OPTIONS=detect_odr_violation=1 + - CONFIG=Debug ASAN_OPTIONS=detect_odr_violation=1 git: depth: 3 @@ -37,7 +37,7 @@ script: - cmake -DCMAKE_BUILD_TYPE=${CONFIG} -DWITH_GUI_TESTS=ON -DWITH_ASAN=ON -DWITH_XC_HTTP=ON -DWITH_XC_AUTOTYPE=ON -DWITH_XC_YUBIKEY=ON $CMAKE_ARGS .. - make -j2 - if [ "$TRAVIS_OS_NAME" = "linux" ]; then make test ARGS+="-E testgui --output-on-failure"; fi - - if [ "$TRAVIS_OS_NAME" = "linux" ]; then xvfb-run -a --server-args="-screen 0 800x600x24" make test ARGS+="-R testgui --output-on-failure"; fi + - if [ "$TRAVIS_OS_NAME" = "linux" ]; then ASAN_OPTIONS=${ASAN_OPTIONS}:leak_check_at_exit=0 xvfb-run -a --server-args="-screen 0 800x600x24" make test ARGS+="-R testgui --output-on-failure"; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then make test ARGS+="--output-on-failure"; fi # Generate snapcraft build when merging into master/develop branches diff --git a/AppImage-Recipe.sh b/AppImage-Recipe.sh index c421aa79e..a5124a74b 100755 --- a/AppImage-Recipe.sh +++ b/AppImage-Recipe.sh @@ -66,10 +66,6 @@ get_apprun copy_deps delete_blacklisted -# remove dbus and systemd libs as they are not blacklisted -find . -name libdbus-1.so.3 -exec rm {} \; -find . -name libsystemd.so.0 -exec rm {} \; - get_desktop get_icon cat << EOF > ./usr/bin/keepassxc_env @@ -89,14 +85,15 @@ else fi EOF chmod +x ./usr/bin/keepassxc_env -sed -i 's/Exec=keepassxc/Exec=keepassxc_env/' org.keepassxc.desktop -get_desktopintegration $LOWERAPP - -GLIBC_NEEDED=$(glibc_needed) +sed -i 's/Exec=keepassxc/Exec=keepassxc_env/' org.${LOWERAPP}.${APP}.desktop +get_desktopintegration "org.${LOWERAPP}.${APP}" cd .. -generate_type2_appimage +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 ../KeePassXC-${VERSION}-${ARCH}.AppImage -rmdir ../out > /dev/null 2>&1 +mv ../out/*.AppImage* ../ +rm -rf ../out @@ -1,3 +1,13 @@ +2.2.3 (2017-12-11) +========================= + +- Prevent database corruption when locked [#1219] +- Fixes apply button not saving new entries [#1141] +- Switch to Consolas font on Windows for password edit [#1229] +- Multiple fixes to AppImage deployment [#1115, #1228] +- Fixes multiple memory leaks [#1213] +- Resize message close to 16x16 pixels [#1253] + 2.2.2 (2017-10-22) ========================= diff --git a/CMakeLists.txt b/CMakeLists.txt index 63281f93b..869da3176 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -49,7 +49,7 @@ set(CMAKE_AUTOUIC ON) set(KEEPASSXC_VERSION_MAJOR "2") set(KEEPASSXC_VERSION_MINOR "2") -set(KEEPASSXC_VERSION_PATCH "2") +set(KEEPASSXC_VERSION_PATCH "3") set(KEEPASSXC_VERSION "${KEEPASSXC_VERSION_MAJOR}.${KEEPASSXC_VERSION_MINOR}.${KEEPASSXC_VERSION_PATCH}") # Distribution info diff --git a/Dockerfile b/Dockerfile index 6f7ace34c..a5966be39 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,67 +14,49 @@ # 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 centos:7 +FROM ubuntu:14.04 -RUN set -x \ - && curl "https://copr.fedorainfracloud.org/coprs/bugzy/keepassxc/repo/epel-7/bugzy-keepassxc-epel-7.repo" \ - > /etc/yum.repos.d/bugzy-keepassxc-epel-7.repo +ENV QT5_VERSION=59 +ENV QT5_PPA_VERSION=${QT5_VERSION}2 RUN set -x \ - && curl "https://copr.fedorainfracloud.org/coprs/sic/backports/repo/epel-7/sic-backports-epel-7.repo" \ - > /etc/yum.repos.d/sic-backports-epel-7.repo + && apt-get update -y \ + && apt-get -y install software-properties-common RUN set -x \ - && yum clean -y all \ - && yum upgrade -y + && add-apt-repository ppa:beineri/opt-qt${QT5_PPA_VERSION}-trusty \ + && add-apt-repository ppa:phoerious/keepassxc -# build and runtime dependencies RUN set -x \ - && yum install -y \ - make \ - automake \ - gcc-c++ \ - cmake \ - libgcrypt16-devel \ - qt5-qtbase-devel \ - qt5-linguist \ - qt5-qttools \ - zlib-devel \ - qt5-qtx11extras \ - qt5-qtx11extras-devel \ - libXi-devel \ - libXtst-devel + && apt-get update -y \ + && apt-get upgrade -y -# AppImage dependencies +# build and runtime dependencies RUN set -x \ - && yum install -y \ - wget \ - fuse-libs - -# build libyubikey -ENV YUBIKEY_VERSION=1.13 -RUN set -x && yum install -y libusb-devel + && apt-get install -y \ + cmake3 \ + g++ \ + libgcrypt20-dev \ + qt${QT5_VERSION}base \ + qt${QT5_VERSION}tools \ + qt${QT5_VERSION}x11extras \ + zlib1g-dev \ + libxi-dev \ + libxtst-dev \ + mesa-common-dev \ + libyubikey-dev \ + libykpers-1-dev + +ENV CMAKE_PREFIX_PATH=/opt/qt${QT5_VERSION}/lib/cmake +ENV LD_LIBRARY_PATH=/opt/qt${QT5_VERSION}/lib RUN set -x \ - && wget "https://developers.yubico.com/yubico-c/Releases/libyubikey-${YUBIKEY_VERSION}.tar.gz" \ - && tar xf libyubikey-${YUBIKEY_VERSION}.tar.gz \ - && cd libyubikey-${YUBIKEY_VERSION} \ - && ./configure --prefix=/usr --libdir=/usr/lib64 \ - && make \ - && make install \ - && cd .. \ - && rm -Rf libyubikey-${YUBIKEY_VERSION}* + && echo /opt/qt${QT_VERSION}/lib > /etc/ld.so.conf.d/qt${QT5_VERSION}.conf -# build libykpers-1 -ENV YKPERS_VERSION=1.18.0 +# AppImage dependencies RUN set -x \ - && wget "https://developers.yubico.com/yubikey-personalization/Releases/ykpers-${YKPERS_VERSION}.tar.gz" \ - && tar xf ykpers-${YKPERS_VERSION}.tar.gz \ - && cd ykpers-${YKPERS_VERSION} \ - && ./configure --prefix=/usr --libdir=/usr/lib64 \ - && make \ - && make install \ - && cd .. \ - && rm -Rf ykpers-${YKPERS_VERSION}* + && apt-get install -y \ + libfuse2 \ + wget VOLUME /keepassxc/src VOLUME /keepassxc/out diff --git a/share/icons/application/16x16/actions/message-close.png b/share/icons/application/16x16/actions/message-close.png Binary files differindex 4b2f9ca4d..b3a44a232 100644 --- a/share/icons/application/16x16/actions/message-close.png +++ b/share/icons/application/16x16/actions/message-close.png diff --git a/share/linux/org.keepassxc.appdata.xml b/share/linux/org.keepassxc.appdata.xml index 563450a4f..1bada3300 100644 --- a/share/linux/org.keepassxc.appdata.xml +++ b/share/linux/org.keepassxc.appdata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright 2017 KeePassXC Team <team@keepassxc.org> --> +<!-<li>Copyright 2017 KeePassXC Team <team@keepassxc.org> --> <component type="desktop-application"> <id>org.keepassxc</id> <name>KeePassXC</name> @@ -67,6 +67,18 @@ </screenshots> <releases> + <release version="2.2.3" date="2017-12-11"> + <description> + <ul> + <li>Prevent database corruption when locked [#1219]</li> + <li>Fixes apply button not saving new entries [#1141]</li> + <li>Switch to Consolas font on Windows for password edit [#1229]</li> + <li>Multiple fixes to AppImage deployment [#1115, #1228]</li> + <li>Fixes multiple memory leaks [#1213]</li> + <li>Resize message close to 16x16 pixels [#1253]</li> + </ul> + </description> + </release> <release version="2.2.2" date="2017-10-22"> <description> <ul> @@ -85,7 +97,8 @@ <li>Fixed screen lock and Google fallback settings [#1029]</li> </ul> </description> - </release><release version="2.2.1" date="2017-10-01"> + </release> + <release version="2.2.1" date="2017-10-01"> <description> <ul> <li>Corrected multiple snap issues [#934, #1011]</li> diff --git a/share/translations/keepassx_de.ts b/share/translations/keepassx_de.ts index 2fd20f04a..f3bd0e39f 100644 --- a/share/translations/keepassx_de.ts +++ b/share/translations/keepassx_de.ts @@ -571,7 +571,7 @@ Sie können sie speichern oder die Sperre freigeben.</translation> Do you want to save the database before locking it? Otherwise your changes are lost.</source> <translation>Dieses Datenbank wurde geändert. -Soll sie gespeichert werden bevor sie gesperrt wirt? +Soll sie gespeichert werden bevor sie gesperrt wird? Anderenfalls gehen Ihre Änderungen verloren.</translation> </message> <message> diff --git a/share/translations/keepassx_es.ts b/share/translations/keepassx_es.ts index f8176b807..479284898 100644 --- a/share/translations/keepassx_es.ts +++ b/share/translations/keepassx_es.ts @@ -69,7 +69,7 @@ Núcleo: %3 %4</translation> </message> <message> <source>Distribution: %1</source> - <translation type="unfinished"/> + <translation>Distribución: %1</translation> </message> </context> <context> @@ -250,7 +250,7 @@ Por favor seleccione si desea autorizar su acceso.</translation> </message> <message> <source>Codec</source> - <translation>Codificación</translation> + <translation>Códec</translation> </message> <message> <source>Text is qualified by</source> @@ -302,11 +302,11 @@ Por favor seleccione si desea autorizar su acceso.</translation> </message> <message> <source>Original data: </source> - <translation>Datos originales:</translation> + <translation>Dato original:</translation> </message> <message> <source>Error(s) detected in CSV file !</source> - <translation>¡Se detectaron errores en el archivo CSV!</translation> + <translation>¡Error(es) detectado(s) en el archivo CSV!</translation> </message> <message> <source> more messages skipped]</source> @@ -728,7 +728,7 @@ Do you want to open it anyway?</source> </message> <message> <source>Merge Request</source> - <translation>Solicitud de unión</translation> + <translation>Solicitud de Unión</translation> </message> <message> <source>The database file has changed and you have unsaved changes.Do you want to merge your changes?</source> @@ -744,7 +744,7 @@ Do you want to open it anyway?</source> </message> <message> <source>Are you sure you want to permanently delete everything from your recycle bin?</source> - <translation>¿Está seguro(a) que quiere permanentemente eliminar todo de su papelera de reciclaje?</translation> + <translation>¿Está seguro que quiere eliminar permanentemente todo de su papelera de reciclaje?</translation> </message> </context> <context> @@ -795,7 +795,7 @@ Do you want to open it anyway?</source> </message> <message> <source>Select file</source> - <translation>Seleccionar archivo llave</translation> + <translation>Seleccionar archivo</translation> </message> <message> <source>Unable to open file</source> @@ -817,11 +817,11 @@ Do you want to open it anyway?</source> </message> <message numerus="yes"> <source>%n week(s)</source> - <translation><numerusform>%n semana</numerusform><numerusform>%n semanas</numerusform></translation> + <translation><numerusform>%n semana</numerusform><numerusform>%n semana(s)</numerusform></translation> </message> <message numerus="yes"> <source>%n month(s)</source> - <translation><numerusform>%n mes</numerusform><numerusform>%n meses</numerusform></translation> + <translation><numerusform>%n mes</numerusform><numerusform>%n mes(es)</numerusform></translation> </message> <message> <source>1 year</source> @@ -969,7 +969,7 @@ Do you want to open it anyway?</source> </message> <message> <source>Presets</source> - <translation>Predeterminado</translation> + <translation>Programar</translation> </message> <message> <source>Notes:</source> @@ -1098,7 +1098,7 @@ Do you want to open it anyway?</source> </message> <message> <source>Custom icon already exists</source> - <translation type="unfinished"/> + <translation>El icono personalizado ya existe</translation> </message> </context> <context> @@ -1352,7 +1352,7 @@ Esta migración es en único sentido. No podrá abrir la base de datos importada </message> <message> <source>Existing single-instance lock file is invalid. Launching new instance.</source> - <translation type="unfinished"/> + <translation>El archivo de bloqueo de instancia única existente no es válido. Lanzando nueva instancia.</translation> </message> </context> <context> @@ -1483,7 +1483,7 @@ Esta migración es en único sentido. No podrá abrir la base de datos importada </message> <message> <source>Timed one-time password</source> - <translation>Contraseña programada de único uso (TOTP)</translation> + <translation>Contraseña programada de único uso</translation> </message> <message> <source>Copy &TOTP</source> diff --git a/share/translations/keepassx_fr.ts b/share/translations/keepassx_fr.ts index 90580e146..f3fa01920 100644 --- a/share/translations/keepassx_fr.ts +++ b/share/translations/keepassx_fr.ts @@ -29,27 +29,27 @@ </message> <message> <source>Revision: %1</source> - <translation>Revision: %1</translation> + <translation>Révision : %1</translation> </message> <message> <source>Libraries:</source> - <translation>Bibliothèques:</translation> + <translation>Bibliothèques :</translation> </message> <message> <source>Operating system: %1 CPU architecture: %2 Kernel: %3 %4</source> - <translation>Système d'exploitation: %1 -Architecture CPU: %2 -Kernel: %3 %4</translation> + <translation>Système d'exploitation : %1 +Architecture CPU : %2 +Kernel : %3 %4</translation> </message> <message> <source>Enabled extensions:</source> - <translation>Extensions activées:</translation> + <translation>Extensions activées :</translation> </message> <message> <source>Report bugs at: <a href="https://github.com/keepassxreboot/keepassxc/issues" style="text-decoration: underline;">https://github.com</a></source> - <translation>Signaler les bugs sur: <a href="https://github.com/keepassxreboot/keepassxc/issues" style="text-decoration: underline;">https://github.com</a></translation> + <translation>Signaler les bugs sur : <a href="https://github.com/keepassxreboot/keepassxc/issues" style="text-decoration: underline;">https://github.com</a></translation> </message> <message> <source>KeePassXC is distributed under the terms of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source> @@ -57,7 +57,7 @@ Kernel: %3 %4</translation> </message> <message> <source>Project Maintainers:</source> - <translation>Mainteneurs du projet:</translation> + <translation>Mainteneurs du projet :</translation> </message> <message> <source><a href="https://github.com/keepassxreboot/keepassxc/graphs/contributors">See Contributions on GitHub</a></source> @@ -65,11 +65,11 @@ Kernel: %3 %4</translation> </message> <message> <source>Include the following information whenever you report a bug:</source> - <translation>Inclure l'information suivante lorsque vous signaler un bug:</translation> + <translation>Inclure l'information suivante lorsque vous signaler un bug :</translation> </message> <message> <source>Distribution: %1</source> - <translation type="unfinished"/> + <translation>Distribution : %1</translation> </message> </context> <context> @@ -302,7 +302,7 @@ Veuillez sélectionner si vous souhaitez autoriser l’accès.</translation> </message> <message> <source>Original data: </source> - <translation>Données originales:</translation> + <translation>Données originales :</translation> </message> <message> <source>Error(s) detected in CSV file !</source> @@ -397,7 +397,7 @@ Veuillez sélectionner si vous souhaitez autoriser l’accès.</translation> </message> <message> <source>Challenge Response:</source> - <translation>Challenge-réponse:</translation> + <translation>Challenge-réponse :</translation> </message> </context> <context> @@ -477,15 +477,15 @@ Vous pouvez maintenant la sauvegarder.</translation> </message> <message> <source>AES: 256 Bit (default)</source> - <translation>AES: 256 Bits (par défault)</translation> + <translation>AES : 256 Bits (par défaut)</translation> </message> <message> <source>Twofish: 256 Bit</source> - <translation>Twofish: 256 bits</translation> + <translation>Twofish : 256 bits</translation> </message> <message> <source>Algorithm:</source> - <translation>Algorithme:</translation> + <translation>Algorithme :</translation> </message> </context> <context> @@ -737,7 +737,7 @@ Voulez vous l'ouvrir quand même ?</translation> </message> <message> <source>Could not open the new database file while attempting to autoreload this database.</source> - <translation>La nouvelle base de données ne peux être ouverte pendant qu'un rafraîchissement automatique de l'actuelle est en cours.</translation> + <translation>La nouvelle base de données ne peut être ouverte pendant qu'un rafraîchissement automatique de l'actuelle est en cours.</translation> </message> <message> <source>Empty recycle bin?</source> @@ -1095,11 +1095,11 @@ Voulez vous l'ouvrir quand même ?</translation> </message> <message> <source>Hint: You can enable Google as a fallback under Tools>Settings>Security</source> - <translation>Astuce: Vous pouvez activer Google en tant que repli sous Outils>Paramètres>Sécurité</translation> + <translation>Astuce : Vous pouvez activer Google en tant que repli sous Outils>Paramètres>Sécurité</translation> </message> <message> <source>Custom icon already exists</source> - <translation type="unfinished"/> + <translation>L'icône personnalisée existe déjà</translation> </message> </context> <context> @@ -1175,7 +1175,7 @@ Voulez vous l'ouvrir quand même ?</translation> <message> <source>Ref: </source> <comment>Reference abbreviation</comment> - <translation>Réf:</translation> + <translation>Réf : </translation> </message> </context> <context> @@ -1353,7 +1353,7 @@ Il s'agit d'une migration à sens unique. Vous ne pourrez pas ouvrir l </message> <message> <source>Existing single-instance lock file is invalid. Launching new instance.</source> - <translation type="unfinished"/> + <translation>Le fichier de verrouillage de l’instance unique existant n’est pas valide. Lancement d'une nouvelle instance.</translation> </message> </context> <context> @@ -1647,11 +1647,11 @@ Il s'agit d'une migration à sens unique. Vous ne pourrez pas ouvrir l </message> <message> <source>HTTP Port:</source> - <translation>Port HTTP:</translation> + <translation>Port HTTP :</translation> </message> <message> <source>Default port: 19455</source> - <translation>Port par défaut: 19455</translation> + <translation>Port par défaut : 19455</translation> </message> <message> <source>Re&quest to unlock the database if it is locked</source> @@ -1681,7 +1681,7 @@ Restauration du port 19455 par défaut.</translation> </message> <message> <source>&Return advanced string fields which start with "KPH: "</source> - <translation>& Retourne les champs avancés de type chaîne qui commencent par "KPH:"</translation> + <translation>& Retourne les champs avancés de type chaîne qui commencent par "KPH :"</translation> </message> <message> <source>Automatically creating or updating string fields is not supported.</source> @@ -1774,7 +1774,7 @@ Ne les changez que si vous savez ce que vous faites.</translation> </message> <message> <source>&Length:</source> - <translation>&Longueur:</translation> + <translation>&Longueur :</translation> </message> <message> <source>Pick characters from every group</source> @@ -1794,11 +1794,11 @@ Ne les changez que si vous savez ce que vous faites.</translation> </message> <message> <source>Entropy: %1 bit</source> - <translation>Entropie: %1 bit</translation> + <translation>Entropie : %1 bit</translation> </message> <message> <source>Password Quality: %1</source> - <translation>Qualité du mot de passe: %1</translation> + <translation>Qualité du mot de passe : %1</translation> </message> <message> <source>Poor</source> @@ -1830,15 +1830,15 @@ Ne les changez que si vous savez ce que vous faites.</translation> </message> <message> <source>Wordlist:</source> - <translation>Liste de mots:</translation> + <translation>Liste de mots :</translation> </message> <message> <source>Word Count:</source> - <translation>Nombre de mots:</translation> + <translation>Nombre de mots :</translation> </message> <message> <source>Word Separator:</source> - <translation>Séparateur de mot:</translation> + <translation>Séparateur de mot :</translation> </message> <message> <source>Copy</source> @@ -2019,7 +2019,7 @@ Veuillez déverrouiller la base de données sélectionnée ou en choisir une qui </message> <message> <source>KeePassXC: New key association request</source> - <translation>KeePassXC: nouvelle demande d'association</translation> + <translation>KeePassXC : nouvelle demande d'association</translation> </message> <message> <source>You have received an association request for the above key. @@ -2031,23 +2031,23 @@ attribuez lui un nom unique pour l'identifier et acceptez la.</translation> </message> <message> <source>KeePassXC: Overwrite existing key?</source> - <translation>KeePassXC: Écraser la clé existante ?</translation> + <translation>KeePassXC : Écraser la clé existante ?</translation> </message> <message> <source>KeePassXC: Update Entry</source> - <translation>KeePassXC: Mettre à jour l'entrée</translation> + <translation>KeePassXC : Mettre à jour l'entrée</translation> </message> <message> <source>KeePassXC: Database locked!</source> - <translation>KeePassXC: Base de données verrouillée !</translation> + <translation>KeePassXC : Base de données verrouillée !</translation> </message> <message> <source>KeePassXC: Removed keys from database</source> - <translation>KeePassXC: Les clés ont été effacées de la base de donnée</translation> + <translation>KeePassXC : Les clés ont été effacées de la base de donnée</translation> </message> <message> <source>KeePassXC: No keys found</source> - <translation>KeePassXC: Aucune clé trouvée</translation> + <translation>KeePassXC : Aucune clé trouvée</translation> </message> <message> <source>KeePassXC: Settings not available!</source> @@ -2055,11 +2055,11 @@ attribuez lui un nom unique pour l'identifier et acceptez la.</translation> </message> <message> <source>KeePassXC: Removed permissions</source> - <translation>KeePassXC: Permissions retirées</translation> + <translation>KeePassXC : Permissions retirées</translation> </message> <message> <source>KeePassXC: No entry with permissions found!</source> - <translation>KeePassXC: Aucune entrée avec permissions trouvée !</translation> + <translation>KeePassXC : Aucune entrée avec permissions trouvée !</translation> </message> </context> <context> @@ -2145,7 +2145,7 @@ attribuez lui un nom unique pour l'identifier et acceptez la.</translation> </message> <message> <source>Don't mark database as modified for non-data changes (e.g., expanding groups)</source> - <translation>Ne pas indiquer la base de données comme modifiée pour les changements hors-données (par exemple: groupes développés)</translation> + <translation>Ne pas indiquer la base de données comme modifiée pour les changements hors-données (par exemple : groupes développés)</translation> </message> <message> <source>Auto-Type</source> @@ -2227,7 +2227,7 @@ attribuez lui un nom unique pour l'identifier et acceptez la.</translation> </message> <message> <source>Key:</source> - <translation>Clé:</translation> + <translation>Clé :</translation> </message> <message> <source>Use custom settings</source> @@ -2235,11 +2235,11 @@ attribuez lui un nom unique pour l'identifier et acceptez la.</translation> </message> <message> <source>Note: Change these settings only if you know what you are doing.</source> - <translation>Attention: modifiez ces paramètres seulement si vous savez ce que vous faites.</translation> + <translation>Attention : modifiez ces paramètres seulement si vous savez ce que vous faites.</translation> </message> <message> <source>Time step:</source> - <translation>Période de temps:</translation> + <translation>Période de temps :</translation> </message> <message> <source>8 digits</source> @@ -2251,7 +2251,7 @@ attribuez lui un nom unique pour l'identifier et acceptez la.</translation> </message> <message> <source>Code size:</source> - <translation>Taille du code:</translation> + <translation>Taille du code :</translation> </message> <message> <source> sec</source> @@ -2375,7 +2375,7 @@ attribuez lui un nom unique pour l'identifier et acceptez la.</translation> </message> <message> <source>Path of the group to list. Default is /</source> - <translation>Chemin du groupe à lister. Par défaut: /</translation> + <translation>Chemin du groupe à lister. Par défaut : /</translation> </message> <message> <source>Print the UUIDs of the entries and groups.</source> diff --git a/share/translations/keepassx_id.ts b/share/translations/keepassx_id.ts index f7db658d2..1e04aeb4c 100644 --- a/share/translations/keepassx_id.ts +++ b/share/translations/keepassx_id.ts @@ -69,7 +69,7 @@ Kernel: %3 %4</translation> </message> <message> <source>Distribution: %1</source> - <translation type="unfinished"/> + <translation>Distribusi: %1</translation> </message> </context> <context> diff --git a/share/translations/keepassx_it.ts b/share/translations/keepassx_it.ts index 5125a8b63..582d18970 100644 --- a/share/translations/keepassx_it.ts +++ b/share/translations/keepassx_it.ts @@ -131,7 +131,7 @@ Seleziona se vuoi consentire l'accesso.</translation> </message> <message> <source>Auto-Type - KeePassXC</source> - <translation> KeePassXC - Auto completamento</translation> + <translation>KeePassXC - Auto completamento</translation> </message> </context> <context> @@ -170,7 +170,7 @@ Seleziona se vuoi consentire l'accesso.</translation> </message> <message> <source>Unable to create Key File : </source> - <translation>Impossibile creare file chiave:</translation> + <translation>Impossibile creare file chiave: </translation> </message> <message> <source>Select a key file</source> @@ -290,11 +290,11 @@ Seleziona se vuoi consentire l'accesso.</translation> </message> <message> <source>Empty fieldname </source> - <translation>Nome campo vuoto</translation> + <translation>Nome campo vuoto </translation> </message> <message> <source>column </source> - <translation>colonna</translation> + <translation>colonna </translation> </message> <message> <source>Imported from CSV file</source> @@ -302,7 +302,7 @@ Seleziona se vuoi consentire l'accesso.</translation> </message> <message> <source>Original data: </source> - <translation>Dati originali:</translation> + <translation>Dati originali: </translation> </message> <message> <source>Error(s) detected in CSV file !</source> @@ -1917,23 +1917,23 @@ Modificale solo se sai quello che stai facendo.</translation> <name>QtIOCompressor</name> <message> <source>Internal zlib error when compressing: </source> - <translation>Errore interno di zlib durante la compressione:</translation> + <translation>Errore interno di zlib durante la compressione: </translation> </message> <message> <source>Error writing to underlying device: </source> - <translation>Errore durante la scrittura nel dispositivo:</translation> + <translation>Errore durante la scrittura nel dispositivo: </translation> </message> <message> <source>Error opening underlying device: </source> - <translation>Errore durante l'apertura dal dispositivo:</translation> + <translation>Errore durante l'apertura dal dispositivo: </translation> </message> <message> <source>Error reading data from underlying device: </source> - <translation>Errore durante la lettura dal dispositivo:</translation> + <translation>Errore durante la lettura dal dispositivo: </translation> </message> <message> <source>Internal zlib error when decompressing: </source> - <translation>Errore interno di zlib durante la decompressione:</translation> + <translation>Errore interno di zlib durante la decompressione: </translation> </message> </context> <context> @@ -1944,7 +1944,7 @@ Modificale solo se sai quello che stai facendo.</translation> </message> <message> <source>Internal zlib error: </source> - <translation>Errore interno di zlib:</translation> + <translation>Errore interno di zlib: </translation> </message> </context> <context> @@ -2018,7 +2018,7 @@ Sblocca il database selezionato o scegli un altro database sbloccato.</translati </message> <message> <source>KeePassXC: New key association request</source> - <translation>KeePassXC: Nuova richiesta di associazione chiave </translation> + <translation>KeePassXC: Nuova richiesta di associazione chiave</translation> </message> <message> <source>You have received an association request for the above key. @@ -2164,7 +2164,7 @@ imposta un nome unico per identificarla ed accettarla.</translation> </message> <message> <source> ms</source> - <translation>ms</translation> + <translation> ms</translation> </message> <message> <source>Start only a single instance of KeePassXC</source> @@ -2179,7 +2179,7 @@ imposta un nome unico per identificarla ed accettarla.</translation> </message> <message> <source> sec</source> - <translation>sec</translation> + <translation> sec</translation> </message> <message> <source>Lock databases after inactivity of</source> @@ -2254,7 +2254,7 @@ imposta un nome unico per identificarla ed accettarla.</translation> </message> <message> <source> sec</source> - <translation>sec</translation> + <translation> sec</translation> </message> </context> <context> diff --git a/share/translations/keepassx_ja.ts b/share/translations/keepassx_ja.ts index 28b7c5336..dd349640f 100644 --- a/share/translations/keepassx_ja.ts +++ b/share/translations/keepassx_ja.ts @@ -69,7 +69,7 @@ CPU アーキテクチャ: %2 </message> <message> <source>Distribution: %1</source> - <translation type="unfinished"/> + <translation>配布形式: %1</translation> </message> </context> <context> diff --git a/share/translations/keepassx_ko.ts b/share/translations/keepassx_ko.ts index 0b528474d..9b00bbc2f 100644 --- a/share/translations/keepassx_ko.ts +++ b/share/translations/keepassx_ko.ts @@ -69,7 +69,7 @@ CPU 아키텍처: %2 </message> <message> <source>Distribution: %1</source> - <translation type="unfinished"/> + <translation>배포판: %1</translation> </message> </context> <context> @@ -1096,7 +1096,7 @@ Do you want to open it anyway?</source> </message> <message> <source>Custom icon already exists</source> - <translation type="unfinished"/> + <translation>사용자 정의 아이콘이 이미 존재함</translation> </message> </context> <context> @@ -1350,7 +1350,7 @@ This is a one-way migration. You won't be able to open the imported databas </message> <message> <source>Existing single-instance lock file is invalid. Launching new instance.</source> - <translation type="unfinished"/> + <translation>존재하는 단일 인스턴스 잠금 파일이 잘못되었습니다. 새 인스턴스를 실행합니다.</translation> </message> </context> <context> diff --git a/share/translations/keepassx_ru.ts b/share/translations/keepassx_ru.ts index 938d5eefd..3058bcf14 100644 --- a/share/translations/keepassx_ru.ts +++ b/share/translations/keepassx_ru.ts @@ -69,7 +69,7 @@ Kernel: %3 %4</source> </message> <message> <source>Distribution: %1</source> - <translation type="unfinished"/> + <translation>Дистрибутив: %1</translation> </message> </context> <context> @@ -219,7 +219,7 @@ Please select whether you want to allow access.</source> </message> <message> <source>Replace username and password with references</source> - <translation>Заменить имя пользователя и пароль к ссылкам</translation> + <translation>Использовать ссылки для имени пользователя и пароля</translation> </message> <message> <source>Copy history</source> @@ -227,7 +227,7 @@ Please select whether you want to allow access.</source> </message> <message> <source>Append ' - Clone' to title</source> - <translation>Добавить' - Клонировать' в заголовок</translation> + <translation>Добавить к названию « - клон»</translation> </message> </context> <context> @@ -579,7 +579,7 @@ Otherwise your changes are lost.</source> <message> <source>"%1" is in edit mode. Discard changes and close anyway?</source> - <translation>«%1» в режиме редактирования. + <translation>«%1» в режиме правки. Отменить изменения и всё равно закрыть?</translation> </message> <message> @@ -741,7 +741,7 @@ Do you want to open it anyway?</source> </message> <message> <source>Empty recycle bin?</source> - <translation>Корзина пустая?</translation> + <translation>Очистить корзину?</translation> </message> <message> <source>Are you sure you want to permanently delete everything from your recycle bin?</source> @@ -784,7 +784,7 @@ Do you want to open it anyway?</source> </message> <message> <source>Edit entry</source> - <translation>Редактировать запись</translation> + <translation>Править запись</translation> </message> <message> <source>Different passwords supplied.</source> @@ -838,7 +838,7 @@ Do you want to open it anyway?</source> </message> <message> <source>[PROTECTED] Press reveal to view or edit</source> - <translation>[Защищён] Нажмите для открытия просмотра или редактирования</translation> + <translation>[Защищён] Нажмите для открытия просмотра или правки</translation> </message> <message> <source>Are you sure you want to remove this attachment?</source> @@ -853,7 +853,7 @@ Do you want to open it anyway?</source> </message> <message> <source>Add</source> - <translation>Добавить</translation> + <translation>Создать</translation> </message> <message> <source>Remove</source> @@ -946,7 +946,7 @@ Do you want to open it anyway?</source> <name>EditEntryWidgetMain</name> <message> <source>Title:</source> - <translation>Заголовок:</translation> + <translation>Название:</translation> </message> <message> <source>Username:</source> @@ -997,7 +997,7 @@ Do you want to open it anyway?</source> </message> <message> <source>Edit group</source> - <translation>Редактировать группу</translation> + <translation>Править группу</translation> </message> <message> <source>Enable</source> @@ -1095,22 +1095,22 @@ Do you want to open it anyway?</source> </message> <message> <source>Hint: You can enable Google as a fallback under Tools>Settings>Security</source> - <translation>Подсказка: вы можете включить Google в качестве резервного копирования в меню «Инструменты»> «Настройки»> «Безопасность»</translation> + <translation>Подсказка: в качестве резервного варианта для получения значков сайтов возможно использовать Google. Включите этот параметр в меню «Инструменты» -> «Настройки» -> «Безопасность»</translation> </message> <message> <source>Custom icon already exists</source> - <translation type="unfinished"/> + <translation>Пользовательский значок уже существует</translation> </message> </context> <context> <name>EditWidgetProperties</name> <message> <source>Created:</source> - <translation>Создано:</translation> + <translation>Создание:</translation> </message> <message> <source>Modified:</source> - <translation>Изменено:</translation> + <translation>Изменение:</translation> </message> <message> <source>Accessed:</source> @@ -1125,7 +1125,7 @@ Do you want to open it anyway?</source> <name>Entry</name> <message> <source> - Clone</source> - <translation> - Клонировать</translation> + <translation> - клон</translation> </message> </context> <context> @@ -1143,7 +1143,7 @@ Do you want to open it anyway?</source> </message> <message> <source>Title</source> - <translation>Заголовок</translation> + <translation>Имя записи</translation> </message> <message> <source>Username</source> @@ -1162,7 +1162,7 @@ Do you want to open it anyway?</source> </message> <message> <source>Title</source> - <translation>Заголовок</translation> + <translation>Имя записи</translation> </message> <message> <source>Username</source> @@ -1353,7 +1353,7 @@ This is a one-way migration. You won't be able to open the imported databas </message> <message> <source>Existing single-instance lock file is invalid. Launching new instance.</source> - <translation type="unfinished"/> + <translation>Запускается новый экземпляр программы, т.к. файл блокировки запуска повреждён.</translation> </message> </context> <context> @@ -1452,11 +1452,11 @@ This is a one-way migration. You won't be able to open the imported databas </message> <message> <source>&Add new entry</source> - <translation>&Добавить новую запись</translation> + <translation>&Создать запись</translation> </message> <message> <source>&View/Edit entry</source> - <translation>&Посмотреть/редактировать запись</translation> + <translation>&Открыть/править запись</translation> </message> <message> <source>&Delete entry</source> @@ -1464,11 +1464,11 @@ This is a one-way migration. You won't be able to open the imported databas </message> <message> <source>&Add new group</source> - <translation>&Добавить новую группу</translation> + <translation>&Создать группу</translation> </message> <message> <source>&Edit group</source> - <translation>&Редактировать группу</translation> + <translation>&Править группу</translation> </message> <message> <source>&Delete group</source> @@ -1524,7 +1524,7 @@ This is a one-way migration. You won't be able to open the imported databas </message> <message> <source>&Title</source> - <translation>&Заголовок</translation> + <translation>&Имя записи</translation> </message> <message> <source>&URL</source> @@ -1556,7 +1556,7 @@ This is a one-way migration. You won't be able to open the imported databas </message> <message> <source>Empty recycle bin</source> - <translation>Корзина пустая</translation> + <translation>Очистить корзину</translation> </message> <message> <source>Access error for config file %1</source> @@ -1701,15 +1701,15 @@ Using default port 19455.</source> </message> <message> <source>&Return only best matching entries</source> - <translation>&Возврат только наиболее совпадающих записей</translation> + <translation>&Показывать только лучшие совпадения</translation> </message> <message> <source>Only entries with the same scheme (http://, https://, ftp://, ...) are returned.</source> - <translation>Возвращаются только записи с той же схемой (http: //, https: //, ftp: //, ...).</translation> + <translation>Будут отобраны только записи с совпадающим протоколом (http://, https://, ftp://, ...).</translation> </message> <message> <source>&Match URL schemes</source> - <translation>&Совпадения схем адресов</translation> + <translation>&Проверять протокол</translation> </message> <message> <source>Password Generator</source> @@ -1879,7 +1879,7 @@ Change them only if you know what you are doing.</source> </message> <message> <source>Title</source> - <translation>Заголовок</translation> + <translation>Имя записи</translation> </message> <message> <source>Username</source> @@ -2085,7 +2085,7 @@ give it a unique name to identify and accept it.</source> <name>SettingsWidgetGeneral</name> <message> <source>Remember last databases</source> - <translation>Помнить последнюю базу данных</translation> + <translation>Запоминать последнюю базу данных</translation> </message> <message> <source>Automatically save on exit</source> @@ -2117,7 +2117,7 @@ give it a unique name to identify and accept it.</source> </message> <message> <source>Hide window to system tray when minimized</source> - <translation>При сворачивании прятать окно в системный лоток</translation> + <translation>При сворачивании скрывать окно в системный лоток</translation> </message> <message> <source>Load previous databases on startup</source> @@ -2129,7 +2129,7 @@ give it a unique name to identify and accept it.</source> </message> <message> <source>Hide window to system tray instead of app exit</source> - <translation>Прятать окно в системный лоток вместо выхода</translation> + <translation>Скрывать окно в системный лоток вместо выхода</translation> </message> <message> <source>Minimize window at application startup</source> @@ -2141,11 +2141,11 @@ give it a unique name to identify and accept it.</source> </message> <message> <source>Remember last key files and security dongles</source> - <translation>Помнить последние ключевые файлы и ключи безопасности</translation> + <translation>Запоминать последние использованные файлы ключей и устройства</translation> </message> <message> <source>Don't mark database as modified for non-data changes (e.g., expanding groups)</source> - <translation>Не помечать базу данных как измененную без изменения данных (например, для расширения групп)</translation> + <translation>Не помечать базу данных изменённой при действиях, не связанных с изменением данных (например, при распахивании групп)</translation> </message> <message> <source>Auto-Type</source> @@ -2153,7 +2153,7 @@ give it a unique name to identify and accept it.</source> </message> <message> <source>Use entry title and URL to match windows for global Auto-Type</source> - <translation>Использовать URL и заголовок записи при сопоставлении окон для глобального автоввода</translation> + <translation>Использовать для поиска URL и название записи</translation> </message> <message> <source>Always ask before performing Auto-Type</source> @@ -2184,7 +2184,7 @@ give it a unique name to identify and accept it.</source> </message> <message> <source>Lock databases after inactivity of</source> - <translation>Заблокировать базу данных после неактивности длительностью</translation> + <translation>Блокировать базу данных при отсутствии активности длительностью</translation> </message> <message> <source>Show passwords in cleartext by default</source> @@ -2192,7 +2192,7 @@ give it a unique name to identify and accept it.</source> </message> <message> <source>Lock databases after minimizing the window</source> - <translation>Блокировать базу данных после сворачивания окна</translation> + <translation>Блокировать базу данных при сворачивания окна</translation> </message> <message> <source>Don't require password repeat when it is visible</source> @@ -2216,7 +2216,7 @@ give it a unique name to identify and accept it.</source> </message> <message> <source>Use Google as fallback for downloading website icons</source> - <translation>Использовать Google как резерв для загрузки значков веб-сайтов</translation> + <translation>Использовать Google в качестве резервного варианта для получения значков веб-сайтов</translation> </message> </context> <context> diff --git a/share/translations/keepassx_zh_TW.ts b/share/translations/keepassx_zh_TW.ts index 0dbabb3ab..54614e5cc 100644 --- a/share/translations/keepassx_zh_TW.ts +++ b/share/translations/keepassx_zh_TW.ts @@ -69,7 +69,7 @@ Kernel: %3 %4</source> </message> <message> <source>Distribution: %1</source> - <translation type="unfinished"/> + <translation>散佈：%1</translation> </message> </context> <context> @@ -196,7 +196,7 @@ Please select whether you want to allow access.</source> </message> <message> <source>Cha&llenge Response</source> - <translation type="unfinished"/> + <translation>挑戰回應</translation> </message> <message> <source>Refresh</source> @@ -208,7 +208,7 @@ Please select whether you want to allow access.</source> </message> <message> <source>Changing master key failed: no YubiKey inserted.</source> - <translation type="unfinished"/> + <translation>挑戰主金鑰失敗：沒有插入 YubiKey</translation> </message> </context> <context> @@ -397,7 +397,7 @@ Please select whether you want to allow access.</source> </message> <message> <source>Challenge Response:</source> - <translation type="unfinished"/> + <translation>挑戰驗證：</translation> </message> </context> <context> @@ -1098,7 +1098,7 @@ Do you want to open it anyway?</source> </message> <message> <source>Custom icon already exists</source> - <translation type="unfinished"/> + <translation>自訂圖示已經存在</translation> </message> </context> <context> @@ -2140,7 +2140,7 @@ give it a unique name to identify and accept it.</source> </message> <message> <source>Remember last key files and security dongles</source> - <translation>記住最近的金鑰檔案與安全加密狗</translation> + <translation>記住最近的金鑰檔案與安全鎖</translation> </message> <message> <source>Don't mark database as modified for non-data changes (e.g., expanding groups)</source> diff --git a/snapcraft.yaml b/snapcraft.yaml index 0d69941ac..051fcebac 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -1,5 +1,5 @@ name: keepassxc -version: 2.2.2 +version: 2.2.3 grade: stable summary: Community-driven port of the Windows application “KeePass Password Safe” description: | diff --git a/src/crypto/SymmetricCipherGcrypt.cpp b/src/crypto/SymmetricCipherGcrypt.cpp index e600a7edb..1805afb0b 100644 --- a/src/crypto/SymmetricCipherGcrypt.cpp +++ b/src/crypto/SymmetricCipherGcrypt.cpp @@ -86,6 +86,8 @@ bool SymmetricCipherGcrypt::init() gcry_error_t error; + if(m_ctx != nullptr) + gcry_cipher_close(m_ctx); error = gcry_cipher_open(&m_ctx, m_algo, m_mode, 0); if (error != 0) { setErrorString(error); diff --git a/src/format/KeePass2Repair.cpp b/src/format/KeePass2Repair.cpp index 81ada2fda..8d18457d4 100644 --- a/src/format/KeePass2Repair.cpp +++ b/src/format/KeePass2Repair.cpp @@ -1,5 +1,6 @@ /* * Copyright (C) 2016 Felix Geyer <debfx@fobos.de> + * 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 @@ -18,36 +19,29 @@ #include "KeePass2Repair.h" #include <QBuffer> +#include <QScopedPointer> #include <QRegExp> #include "format/KeePass2RandomStream.h" #include "format/KeePass2Reader.h" #include "format/KeePass2XmlReader.h" -KeePass2Repair::KeePass2Repair() - : m_db(nullptr) +KeePass2Repair::RepairOutcome KeePass2Repair::repairDatabase(QIODevice* device, const CompositeKey& key) { -} - -KeePass2Repair::RepairResult KeePass2Repair::repairDatabase(QIODevice* device, const CompositeKey& key) -{ - m_db = nullptr; m_errorStr.clear(); KeePass2Reader reader; reader.setSaveXml(true); - Database* db = reader.readDatabase(device, key, true); + QScopedPointer<Database> db(reader.readDatabase(device, key, true)); if (!reader.hasError()) { - delete db; - return NothingTodo; + return qMakePair(NothingTodo, nullptr); } QByteArray xmlData = reader.xmlData(); if (!db || xmlData.isEmpty()) { - delete db; m_errorStr = reader.errorString(); - return UnableToOpen; + return qMakePair(UnableToOpen, nullptr); } bool repairAction = false; @@ -59,8 +53,7 @@ KeePass2Repair::RepairResult KeePass2Repair::repairDatabase(QIODevice* device, c && encodingRegExp.cap(1).compare("utf8", Qt::CaseInsensitive) != 0) { // database is not utf-8 encoded, we don't support repairing that - delete db; - return RepairFailed; + return qMakePair(RepairFailed, nullptr); } } @@ -75,8 +68,7 @@ KeePass2Repair::RepairResult KeePass2Repair::repairDatabase(QIODevice* device, c if (!repairAction) { // we were unable to find the problem - delete db; - return RepairFailed; + return qMakePair(RepairFailed, nullptr); } KeePass2RandomStream randomStream; @@ -84,23 +76,16 @@ KeePass2Repair::RepairResult KeePass2Repair::repairDatabase(QIODevice* device, c KeePass2XmlReader xmlReader; QBuffer buffer(&xmlData); buffer.open(QIODevice::ReadOnly); - xmlReader.readDatabase(&buffer, db, &randomStream); + xmlReader.readDatabase(&buffer, db.data(), &randomStream); if (xmlReader.hasError()) { - delete db; - return RepairFailed; + return qMakePair(RepairFailed, nullptr); } else { - m_db = db; - return RepairSuccess; + return qMakePair(RepairSuccess, db.take()); } } -Database* KeePass2Repair::database() const -{ - return m_db; -} - QString KeePass2Repair::errorString() const { return m_errorStr; diff --git a/src/format/KeePass2Repair.h b/src/format/KeePass2Repair.h index fe2f9dbfe..e7f2c8435 100644 --- a/src/format/KeePass2Repair.h +++ b/src/format/KeePass2Repair.h @@ -1,5 +1,6 @@ /* * Copyright (C) 2016 Felix Geyer <debfx@fobos.de> + * 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 @@ -20,6 +21,7 @@ #include <QCoreApplication> #include <QIODevice> +#include <QPair> #include "core/Database.h" #include "keys/CompositeKey.h" @@ -36,14 +38,12 @@ public: RepairSuccess, RepairFailed }; + using RepairOutcome = QPair<RepairResult, Database*>; - KeePass2Repair(); - RepairResult repairDatabase(QIODevice* device, const CompositeKey& key); - Database* database() const; + RepairOutcome repairDatabase(QIODevice* device, const CompositeKey& key); QString errorString() const; private: - Database* m_db; QString m_errorStr; }; diff --git a/src/gui/DatabaseOpenWidget.cpp b/src/gui/DatabaseOpenWidget.cpp index ee0e9de26..e487f97ca 100644 --- a/src/gui/DatabaseOpenWidget.cpp +++ b/src/gui/DatabaseOpenWidget.cpp @@ -95,11 +95,16 @@ void DatabaseOpenWidget::showEvent(QShowEvent* event) m_ui->editPassword->setFocus(); #ifdef WITH_XC_YUBIKEY - connect(YubiKey::instance(), SIGNAL(detected(int,bool)), SLOT(yubikeyDetected(int,bool)), Qt::QueuedConnection); - connect(YubiKey::instance(), SIGNAL(detectComplete()), SLOT(yubikeyDetectComplete()), Qt::QueuedConnection); - connect(YubiKey::instance(), SIGNAL(notFound()), SLOT(noYubikeyFound()), Qt::QueuedConnection); - - pollYubikey(); + // showEvent() may be called twice, so make sure we are only polling once + if (!m_yubiKeyBeingPolled) { + connect(YubiKey::instance(), SIGNAL(detected(int, bool)), SLOT(yubikeyDetected(int, bool)), + Qt::QueuedConnection); + connect(YubiKey::instance(), SIGNAL(detectComplete()), SLOT(yubikeyDetectComplete()), Qt::QueuedConnection); + connect(YubiKey::instance(), SIGNAL(notFound()), SLOT(noYubikeyFound()), Qt::QueuedConnection); + + pollYubikey(); + m_yubiKeyBeingPolled = true; + } #endif } @@ -110,6 +115,7 @@ void DatabaseOpenWidget::hideEvent(QHideEvent* event) #ifdef WITH_XC_YUBIKEY // Don't listen to any Yubikey events if we are hidden disconnect(YubiKey::instance(), 0, this, 0); + m_yubiKeyBeingPolled = false; #endif } @@ -311,10 +317,12 @@ void DatabaseOpenWidget::yubikeyDetectComplete() m_ui->checkChallengeResponse->setEnabled(true); m_ui->buttonRedetectYubikey->setEnabled(true); m_ui->yubikeyProgress->setVisible(false); + m_yubiKeyBeingPolled = false; } void DatabaseOpenWidget::noYubikeyFound() { m_ui->buttonRedetectYubikey->setEnabled(true); m_ui->yubikeyProgress->setVisible(false); + m_yubiKeyBeingPolled = false; } diff --git a/src/gui/DatabaseOpenWidget.h b/src/gui/DatabaseOpenWidget.h index a7691a91e..aade111c3 100644 --- a/src/gui/DatabaseOpenWidget.h +++ b/src/gui/DatabaseOpenWidget.h @@ -73,6 +73,7 @@ protected: QString m_filename; private: + bool m_yubiKeyBeingPolled = false; Q_DISABLE_COPY(DatabaseOpenWidget) }; diff --git a/src/gui/DatabaseRepairWidget.cpp b/src/gui/DatabaseRepairWidget.cpp index 2b0039408..d3dddf14f 100644 --- a/src/gui/DatabaseRepairWidget.cpp +++ b/src/gui/DatabaseRepairWidget.cpp @@ -1,5 +1,6 @@ /* * Copyright (C) 2016 Felix Geyer <debfx@fobos.de> + * 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 @@ -69,7 +70,8 @@ void DatabaseRepairWidget::openDatabase() delete m_db; } QApplication::setOverrideCursor(QCursor(Qt::WaitCursor)); - KeePass2Repair::RepairResult repairResult = repair.repairDatabase(&file, masterKey); + auto repairOutcome = repair.repairDatabase(&file, masterKey); + KeePass2Repair::RepairResult repairResult = repairOutcome.first; QApplication::restoreOverrideCursor(); switch (repairResult) { @@ -83,7 +85,7 @@ void DatabaseRepairWidget::openDatabase() emit editFinished(false); return; case KeePass2Repair::RepairSuccess: - m_db = repair.database(); + m_db = repairOutcome.second; MessageBox::warning(this, tr("Success"), tr("The database has been successfully repaired\nYou can now save it.")); emit editFinished(true); return; diff --git a/src/gui/DatabaseTabWidget.cpp b/src/gui/DatabaseTabWidget.cpp index 4c9445ccc..f70df4c79 100644 --- a/src/gui/DatabaseTabWidget.cpp +++ b/src/gui/DatabaseTabWidget.cpp @@ -298,8 +298,7 @@ bool DatabaseTabWidget::closeDatabase(Database* db) if (!saveDatabase(db)) { return false; } - } - else { + } else if (dbStruct.dbWidget->currentMode() != DatabaseWidget::LockedMode) { QMessageBox::StandardButton result = MessageBox::question( this, tr("Save changes?"), @@ -307,10 +306,9 @@ bool DatabaseTabWidget::closeDatabase(Database* db) QMessageBox::Yes | QMessageBox::Discard | QMessageBox::Cancel, QMessageBox::Yes); if (result == QMessageBox::Yes) { if (!saveDatabase(db)) { - return false; + return false; } - } - else if (result == QMessageBox::Cancel) { + } else if (result == QMessageBox::Cancel) { return false; } } @@ -355,8 +353,13 @@ bool DatabaseTabWidget::saveDatabase(Database* db) { DatabaseManagerStruct& dbStruct = m_dbList[db]; - if (dbStruct.saveToFilename) { + if (dbStruct.dbWidget->currentMode() == DatabaseWidget::LockedMode) { + // Never allow saving a locked database; it causes corruption + // We return true since a save is not required + return true; + } + if (dbStruct.saveToFilename) { dbStruct.dbWidget->blockAutoReload(true); QString errorMessage = db->saveToFile(dbStruct.canonicalFilePath); dbStruct.dbWidget->blockAutoReload(false); @@ -375,7 +378,6 @@ bool DatabaseTabWidget::saveDatabase(Database* db) MessageWidget::Error); return false; } - } else { return saveDatabaseAs(db); } diff --git a/src/gui/DatabaseWidget.cpp b/src/gui/DatabaseWidget.cpp index 3a39bddcf..453b2009b 100644 --- a/src/gui/DatabaseWidget.cpp +++ b/src/gui/DatabaseWidget.cpp @@ -1125,7 +1125,7 @@ void DatabaseWidget::onWatchedFileChanged() void DatabaseWidget::reloadDatabaseFile() { - if (m_db == nullptr) + if (m_db == nullptr || currentMode() == DatabaseWidget::LockedMode) return; if (! config()->get("AutoReloadOnChange").toBool()) { diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp index f1d5f866c..e37a7d28c 100644 --- a/src/gui/MainWindow.cpp +++ b/src/gui/MainWindow.cpp @@ -881,7 +881,7 @@ void MainWindow::toggleWindow() raise(); activateWindow(); -#if defined(Q_OS_LINUX) && ! defined(QT_NO_DBUS) +#if defined(Q_OS_LINUX) && ! defined(QT_NO_DBUS) && (QT_VERSION < QT_VERSION_CHECK(5, 9, 0)) // re-register global D-Bus menu (needed on Ubuntu with Unity) // see https://github.com/keepassxreboot/keepassxc/issues/271 // and https://bugreports.qt.io/browse/QTBUG-58723 diff --git a/src/gui/PasswordEdit.cpp b/src/gui/PasswordEdit.cpp index 54b0ca288..ad736bf20 100644 --- a/src/gui/PasswordEdit.cpp +++ b/src/gui/PasswordEdit.cpp @@ -31,9 +31,18 @@ PasswordEdit::PasswordEdit(QWidget* parent) { setEchoMode(QLineEdit::Password); updateStylesheet(); - - // set font to system monospace font and increase letter spacing + + // use a monospace font for the password field QFont passwordFont = QFontDatabase::systemFont(QFontDatabase::FixedFont); +#ifdef Q_OS_WIN + // try to use Consolas on Windows, because the default Courier New has too many similar characters + QFont consolasFont = QFontDatabase().font("Consolas", passwordFont.styleName(), passwordFont.pointSize()); + const QFont defaultFont; + if (passwordFont != defaultFont) { + passwordFont = consolasFont; + } +#endif + passwordFont.setLetterSpacing(QFont::PercentageSpacing, 110); setFont(passwordFont); } diff --git a/src/gui/entry/EditEntryWidget.cpp b/src/gui/entry/EditEntryWidget.cpp index 809ac95eb..5a058bda4 100644 --- a/src/gui/entry/EditEntryWidget.cpp +++ b/src/gui/entry/EditEntryWidget.cpp @@ -278,6 +278,7 @@ void EditEntryWidget::loadEntry(Entry* entry, bool create, bool history, const Q m_database = database; m_create = create; m_history = history; + m_saved = false; if (history) { setHeadline(QString("%1 > %2").arg(parentName, tr("Entry history"))); @@ -438,6 +439,7 @@ void EditEntryWidget::saveEntry() } updateEntryData(m_entry); + m_saved = true; if (!m_create) { m_entry->endUpdate(); @@ -510,7 +512,7 @@ void EditEntryWidget::cancel() clear(); - emit editFinished(false); + emit editFinished(m_saved); } void EditEntryWidget::clear() diff --git a/src/gui/entry/EditEntryWidget.h b/src/gui/entry/EditEntryWidget.h index 2888d43a8..628f8f8ed 100644 --- a/src/gui/entry/EditEntryWidget.h +++ b/src/gui/entry/EditEntryWidget.h @@ -121,6 +121,7 @@ private: bool m_create; bool m_history; + bool m_saved; const QScopedPointer<Ui::EditEntryWidgetMain> m_mainUi; const QScopedPointer<Ui::EditEntryWidgetAdvanced> m_advancedUi; const QScopedPointer<Ui::EditEntryWidgetAutoType> m_autoTypeUi; diff --git a/tests/TestCsvParser.cpp b/tests/TestCsvParser.cpp index 57bc683a2..a292b56bb 100644 --- a/tests/TestCsvParser.cpp +++ b/tests/TestCsvParser.cpp @@ -24,17 +24,12 @@ QTEST_GUILESS_MAIN(TestCsvParser) void TestCsvParser::initTestCase() { - parser = new CsvParser(); -} - -void TestCsvParser::cleanupTestCase() -{ - delete parser; + parser.reset(new CsvParser()); } void TestCsvParser::init() { - file = new QTemporaryFile(); + file.reset(new QTemporaryFile()); if (not file->open()) QFAIL("Cannot open file!"); parser->setBackslashSyntax(false); @@ -51,20 +46,20 @@ void TestCsvParser::cleanup() /****************** TEST CASES ******************/ void TestCsvParser::testMissingQuote() { parser->setTextQualifier(':'); - QTextStream out(file); + QTextStream out(file.data()); out << "A,B\n:BM,1"; QEXPECT_FAIL("", "Bad format", Continue); - QVERIFY(parser->parse(file)); + QVERIFY(parser->parse(file.data())); t = parser->getCsvTable(); QWARN(parser->getStatus().toLatin1()); } void TestCsvParser::testMalformed() { parser->setTextQualifier(':'); - QTextStream out(file); + QTextStream out(file.data()); out << "A,B,C\n:BM::,1,:2:"; QEXPECT_FAIL("", "Bad format", Continue); - QVERIFY(parser->parse(file)); + QVERIFY(parser->parse(file.data())); t = parser->getCsvTable(); QWARN(parser->getStatus().toLatin1()); } @@ -72,14 +67,14 @@ void TestCsvParser::testMalformed() { void TestCsvParser::testBackslashSyntax() { parser->setBackslashSyntax(true); parser->setTextQualifier(QChar('X')); - QTextStream out(file); + QTextStream out(file.data()); //attended result: one"\t\"wo out << "Xone\\\"\\\\t\\\\\\\"w\noX\n" << "X13X,X2\\X,X,\"\"3\"X\r" << "3,X\"4\"X,,\n" << "XX\n" << "\\"; - QVERIFY(parser->parse(file)); + QVERIFY(parser->parse(file.data())); t = parser->getCsvTable(); QVERIFY(t.at(0).at(0) == "one\"\\t\\\"w\no"); QVERIFY(t.at(1).at(0) == "13"); @@ -94,10 +89,10 @@ void TestCsvParser::testBackslashSyntax() { } void TestCsvParser::testQuoted() { - QTextStream out(file); + QTextStream out(file.data()); out << "ro,w,\"end, of \"\"\"\"\"\"row\"\"\"\"\"\n" << "2\n"; - QVERIFY(parser->parse(file)); + QVERIFY(parser->parse(file.data())); t = parser->getCsvTable(); QVERIFY(t.at(0).at(0) == "ro"); QVERIFY(t.at(0).at(1) == "w"); @@ -107,41 +102,41 @@ void TestCsvParser::testQuoted() { } void TestCsvParser::testEmptySimple() { - QTextStream out(file); + QTextStream out(file.data()); out <<""; - QVERIFY(parser->parse(file)); + QVERIFY(parser->parse(file.data())); t = parser->getCsvTable(); QVERIFY(t.size() == 0); } void TestCsvParser::testEmptyQuoted() { - QTextStream out(file); + QTextStream out(file.data()); out <<"\"\""; - QVERIFY(parser->parse(file)); + QVERIFY(parser->parse(file.data())); t = parser->getCsvTable(); QVERIFY(t.size() == 0); } void TestCsvParser::testEmptyNewline() { - QTextStream out(file); + QTextStream out(file.data()); out <<"\"\n\""; - QVERIFY(parser->parse(file)); + QVERIFY(parser->parse(file.data())); t = parser->getCsvTable(); QVERIFY(t.size() == 0); } void TestCsvParser::testEmptyFile() { - QVERIFY(parser->parse(file)); + QVERIFY(parser->parse(file.data())); t = parser->getCsvTable(); QVERIFY(t.size() == 0); } void TestCsvParser::testNewline() { - QTextStream out(file); + QTextStream out(file.data()); out << "1,2\n\n\n"; - QVERIFY(parser->parse(file)); + QVERIFY(parser->parse(file.data())); t = parser->getCsvTable(); QVERIFY(t.size() == 1); QVERIFY(t.at(0).at(0) == "1"); @@ -150,9 +145,9 @@ void TestCsvParser::testNewline() void TestCsvParser::testCR() { - QTextStream out(file); + QTextStream out(file.data()); out << "1,2\r3,4"; - QVERIFY(parser->parse(file)); + QVERIFY(parser->parse(file.data())); t = parser->getCsvTable(); QVERIFY(t.size() == 2); QVERIFY(t.at(0).at(0) == "1"); @@ -163,9 +158,9 @@ void TestCsvParser::testCR() void TestCsvParser::testLF() { - QTextStream out(file); + QTextStream out(file.data()); out << "1,2\n3,4"; - QVERIFY(parser->parse(file)); + QVERIFY(parser->parse(file.data())); t = parser->getCsvTable(); QVERIFY(t.size() == 2); QVERIFY(t.at(0).at(0) == "1"); @@ -176,9 +171,9 @@ void TestCsvParser::testLF() void TestCsvParser::testCRLF() { - QTextStream out(file); + QTextStream out(file.data()); out << "1,2\r\n3,4"; - QVERIFY(parser->parse(file)); + QVERIFY(parser->parse(file.data())); t = parser->getCsvTable(); QVERIFY(t.size() == 2); QVERIFY(t.at(0).at(0) == "1"); @@ -189,13 +184,13 @@ void TestCsvParser::testCRLF() void TestCsvParser::testComments() { - QTextStream out(file); + QTextStream out(file.data()); out << " #one\n" << " \t # two, three \r\n" << " #, sing\t with\r" << " #\t me!\n" << "useful,text #1!"; - QVERIFY(parser->parse(file)); + QVERIFY(parser->parse(file.data())); t = parser->getCsvTable(); QVERIFY(t.size() == 1); QVERIFY(t.at(0).at(0) == "useful"); @@ -203,21 +198,21 @@ void TestCsvParser::testComments() } void TestCsvParser::testColumns() { - QTextStream out(file); + QTextStream out(file.data()); out << "1,2\n" << ",,,,,,,,,a\n" << "a,b,c,d\n"; - QVERIFY(parser->parse(file)); + QVERIFY(parser->parse(file.data())); t = parser->getCsvTable(); QVERIFY(parser->getCsvCols() == 10); } void TestCsvParser::testSimple() { - QTextStream out(file); + QTextStream out(file.data()); out << ",,2\r,2,3\n" << "A,,B\"\n" << " ,,\n"; - QVERIFY(parser->parse(file)); + QVERIFY(parser->parse(file.data())); t = parser->getCsvTable(); QVERIFY(t.size() == 4); QVERIFY(t.at(0).at(0) == ""); @@ -236,11 +231,11 @@ void TestCsvParser::testSimple() { void TestCsvParser::testSeparator() { parser->setFieldSeparator('\t'); - QTextStream out(file); + QTextStream out(file.data()); out << "\t\t2\r\t2\t3\n" << "A\t\tB\"\n" << " \t\t\n"; - QVERIFY(parser->parse(file)); + QVERIFY(parser->parse(file.data())); t = parser->getCsvTable(); QVERIFY(t.size() == 4); QVERIFY(t.at(0).at(0) == ""); @@ -260,10 +255,10 @@ void TestCsvParser::testSeparator() { void TestCsvParser::testMultiline() { parser->setTextQualifier(QChar(':')); - QTextStream out(file); + QTextStream out(file.data()); out << ":1\r\n2a::b:,:3\r4:\n" << "2\n"; - QVERIFY(parser->parse(file)); + QVERIFY(parser->parse(file.data())); t = parser->getCsvTable(); QVERIFY(t.at(0).at(0) == "1\n2a:b"); QVERIFY(t.at(0).at(1) == "3\n4"); @@ -281,10 +276,10 @@ void TestCsvParser::testEmptyReparsing() void TestCsvParser::testReparsing() { - QTextStream out(file); + QTextStream out(file.data()); out << ":te\r\nxt1:,:te\rxt2:,:end of \"this\n string\":\n" << "2\n"; - QVERIFY(parser->parse(file)); + QVERIFY(parser->parse(file.data())); t = parser->getCsvTable(); QEXPECT_FAIL("", "Wrong qualifier", Continue); @@ -303,10 +298,10 @@ void TestCsvParser::testReparsing() void TestCsvParser::testQualifier() { parser->setTextQualifier(QChar('X')); - QTextStream out(file); + QTextStream out(file.data()); out << "X1X,X2XX,X,\"\"3\"\"\"X\r" << "3,X\"4\"X,,\n"; - QVERIFY(parser->parse(file)); + QVERIFY(parser->parse(file.data())); t = parser->getCsvTable(); QVERIFY(t.size() == 2); QVERIFY(t.at(0).at(0) == "1"); @@ -324,10 +319,10 @@ void TestCsvParser::testUnicode() { //CORRECT QChar g(0x20AC); //ERROR QChar g("\u20AC"); parser->setFieldSeparator(QChar('A')); - QTextStream out(file); + QTextStream out(file.data()); out << QString("€1A2śA\"3śAż\"Ażac"); - QVERIFY(parser->parse(file)); + QVERIFY(parser->parse(file.data())); t = parser->getCsvTable(); QVERIFY(t.size() == 1); QVERIFY(t.at(0).at(0) == "€1"); diff --git a/tests/TestCsvParser.h b/tests/TestCsvParser.h index 0cf8b94d3..f8c327d63 100644 --- a/tests/TestCsvParser.h +++ b/tests/TestCsvParser.h @@ -22,6 +22,7 @@ #include <QObject> #include <QFile> #include <QTemporaryFile> +#include <QScopedPointer> #include "core/CsvParser.h" @@ -37,7 +38,6 @@ private slots: void init(); void cleanup(); void initTestCase(); - void cleanupTestCase(); void testUnicode(); void testLF(); @@ -62,8 +62,8 @@ private slots: void testColumns(); private: - QTemporaryFile* file; - CsvParser* parser; + QScopedPointer<QTemporaryFile> file; + QScopedPointer<CsvParser> parser; CsvTable t; void dumpRow(CsvTable table, int row); }; diff --git a/tests/TestGroup.cpp b/tests/TestGroup.cpp index 50997dcca..dfccf5d0b 100644 --- a/tests/TestGroup.cpp +++ b/tests/TestGroup.cpp @@ -18,9 +18,10 @@ #include "TestGroup.h" +#include <QDebug> #include <QPointer> +#include <QScopedPointer> #include <QSignalSpy> -#include <QDebug> #include <QTest> #include "core/Database.h" @@ -76,6 +77,7 @@ void TestGroup::testParenting() QCOMPARE(g4->children().size(), 0); QVERIFY(rootGroup->children().at(0) == g1); + QVERIFY(rootGroup->children().at(0) == g1); QVERIFY(g1->children().at(0) == g2); QVERIFY(g1->children().at(1) == g3); QVERIFY(g3->children().contains(g4)); @@ -99,7 +101,6 @@ void TestGroup::testParenting() g3->setIcon(Uuid::random()); g1->setIcon(2); QCOMPARE(spy.count(), 6); - delete db; QVERIFY(rootGroup.isNull()); @@ -107,7 +108,6 @@ void TestGroup::testParenting() QVERIFY(g2.isNull()); QVERIFY(g3.isNull()); QVERIFY(g4.isNull()); - delete tmpRoot; } @@ -117,18 +117,18 @@ void TestGroup::testSignals() Database* db2 = new Database(); QPointer<Group> root = db->rootGroup(); - QSignalSpy spyAboutToAdd(db, SIGNAL(groupAboutToAdd(Group*,int))); + QSignalSpy spyAboutToAdd(db, SIGNAL(groupAboutToAdd(Group*, int))); QSignalSpy spyAdded(db, SIGNAL(groupAdded())); QSignalSpy spyAboutToRemove(db, SIGNAL(groupAboutToRemove(Group*))); QSignalSpy spyRemoved(db, SIGNAL(groupRemoved())); - QSignalSpy spyAboutToMove(db, SIGNAL(groupAboutToMove(Group*,Group*,int))); + QSignalSpy spyAboutToMove(db, SIGNAL(groupAboutToMove(Group*, Group*, int))); QSignalSpy spyMoved(db, SIGNAL(groupMoved())); - QSignalSpy spyAboutToAdd2(db2, SIGNAL(groupAboutToAdd(Group*,int))); + QSignalSpy spyAboutToAdd2(db2, SIGNAL(groupAboutToAdd(Group*, int))); QSignalSpy spyAdded2(db2, SIGNAL(groupAdded())); QSignalSpy spyAboutToRemove2(db2, SIGNAL(groupAboutToRemove(Group*))); QSignalSpy spyRemoved2(db2, SIGNAL(groupRemoved())); - QSignalSpy spyAboutToMove2(db2, SIGNAL(groupAboutToMove(Group*,Group*,int))); + QSignalSpy spyAboutToMove2(db2, SIGNAL(groupAboutToMove(Group*, Group*, int))); QSignalSpy spyMoved2(db2, SIGNAL(groupMoved())); Group* g1 = new Group(); @@ -251,7 +251,7 @@ void TestGroup::testEntries() void TestGroup::testDeleteSignals() { - Database* db = new Database(); + QScopedPointer<Database> db(new Database()); Group* groupRoot = db->rootGroup(); Group* groupChild = new Group(); Group* groupChildChild = new Group(); @@ -260,15 +260,13 @@ void TestGroup::testDeleteSignals() groupChildChild->setObjectName("groupChildChild"); groupChild->setParent(groupRoot); groupChildChild->setParent(groupChild); - QSignalSpy spyAboutToRemove(db, SIGNAL(groupAboutToRemove(Group*))); - QSignalSpy spyRemoved(db, SIGNAL(groupRemoved())); + QSignalSpy spyAboutToRemove(db.data(), SIGNAL(groupAboutToRemove(Group*))); + QSignalSpy spyRemoved(db.data(), SIGNAL(groupRemoved())); delete groupChild; QVERIFY(groupRoot->children().isEmpty()); QCOMPARE(spyAboutToRemove.count(), 2); QCOMPARE(spyRemoved.count(), 2); - delete db; - Group* group = new Group(); Entry* entry = new Entry(); @@ -282,7 +280,7 @@ void TestGroup::testDeleteSignals() QCOMPARE(spyEntryRemoved.count(), 1); delete group; - Database* db2 = new Database(); + QScopedPointer<Database> db2(new Database()); Group* groupRoot2 = db2->rootGroup(); Group* group2 = new Group(); group2->setParent(groupRoot2); @@ -294,12 +292,11 @@ void TestGroup::testDeleteSignals() delete group2; QCOMPARE(spyEntryAboutToRemove2.count(), 1); QCOMPARE(spyEntryRemoved2.count(), 1); - delete db2; } void TestGroup::testCopyCustomIcon() { - Database* dbSource = new Database(); + QScopedPointer<Database> dbSource(new Database()); Uuid groupIconUuid = Uuid::random(); QImage groupIcon(16, 16, QImage::Format_RGB32); @@ -321,7 +318,7 @@ void TestGroup::testCopyCustomIcon() entry->setIcon(entryIconUuid); QCOMPARE(entry->icon(), entryIcon); - Database* dbTarget = new Database(); + QScopedPointer<Database> dbTarget(new Database()); group->setParent(dbTarget->rootGroup()); QVERIFY(dbTarget->metadata()->containsCustomIcon(groupIconUuid)); @@ -332,37 +329,34 @@ void TestGroup::testCopyCustomIcon() QVERIFY(dbTarget->metadata()->containsCustomIcon(entryIconUuid)); QCOMPARE(dbTarget->metadata()->customIcon(entryIconUuid), entryIcon); QCOMPARE(entry->icon(), entryIcon); - - delete dbSource; - delete dbTarget; } void TestGroup::testClone() { - Database* db = new Database(); + QScopedPointer<Database> db(new Database()); - Group* originalGroup = new Group(); + QScopedPointer<Group> originalGroup(new Group()); originalGroup->setParent(db->rootGroup()); originalGroup->setName("Group"); originalGroup->setIcon(42); - Entry* originalGroupEntry = new Entry(); - originalGroupEntry->setGroup(originalGroup); + QScopedPointer<Entry> originalGroupEntry(new Entry()); + originalGroupEntry->setGroup(originalGroup.data()); originalGroupEntry->setTitle("GroupEntryOld"); originalGroupEntry->setIcon(43); originalGroupEntry->beginUpdate(); originalGroupEntry->setTitle("GroupEntry"); originalGroupEntry->endUpdate(); - Group* subGroup = new Group(); - subGroup->setParent(originalGroup); + QScopedPointer<Group> subGroup(new Group()); + subGroup->setParent(originalGroup.data()); subGroup->setName("SubGroup"); - Entry* subGroupEntry = new Entry(); - subGroupEntry->setGroup(subGroup); + QScopedPointer<Entry> subGroupEntry(new Entry()); + subGroupEntry->setGroup(subGroup.data()); subGroupEntry->setTitle("SubGroupEntry"); - Group* clonedGroup = originalGroup->clone(); + QScopedPointer<Group> clonedGroup(originalGroup->clone()); QVERIFY(!clonedGroup->parentGroup()); QVERIFY(!clonedGroup->database()); QVERIFY(clonedGroup->uuid() != originalGroup->uuid()); @@ -387,19 +381,15 @@ void TestGroup::testClone() QVERIFY(clonedSubGroupEntry->uuid() != subGroupEntry->uuid()); QCOMPARE(clonedSubGroupEntry->title(), QString("SubGroupEntry")); - Group* clonedGroupKeepUuid = originalGroup->clone(Entry::CloneNoFlags); + QScopedPointer<Group> clonedGroupKeepUuid(originalGroup->clone(Entry::CloneNoFlags)); QCOMPARE(clonedGroupKeepUuid->entries().at(0)->uuid(), originalGroupEntry->uuid()); QCOMPARE(clonedGroupKeepUuid->children().at(0)->entries().at(0)->uuid(), subGroupEntry->uuid()); - - delete clonedGroup; - delete clonedGroupKeepUuid; - delete db; } void TestGroup::testCopyCustomIcons() { - Database* dbSource = new Database(); - Database* dbTarget = new Database(); + QScopedPointer<Database> dbSource(new Database()); + QScopedPointer<Database> dbTarget(new Database()); QImage iconImage1(1, 1, QImage::Format_RGB32); iconImage1.setPixel(0, 0, qRgb(1, 2, 3)); @@ -407,20 +397,20 @@ void TestGroup::testCopyCustomIcons() QImage iconImage2(1, 1, QImage::Format_RGB32); iconImage2.setPixel(0, 0, qRgb(4, 5, 6)); - Group* group1 = new Group(); + QScopedPointer<Group> group1(new Group()); group1->setParent(dbSource->rootGroup()); Uuid group1Icon = Uuid::random(); dbSource->metadata()->addCustomIcon(group1Icon, iconImage1); group1->setIcon(group1Icon); - Group* group2 = new Group(); - group2->setParent(group1); + QScopedPointer<Group> group2(new Group()); + group2->setParent(group1.data()); Uuid group2Icon = Uuid::random(); dbSource->metadata()->addCustomIcon(group2Icon, iconImage1); group2->setIcon(group2Icon); - Entry* entry1 = new Entry(); - entry1->setGroup(group2); + QScopedPointer<Entry> entry1(new Entry()); + entry1->setGroup(group2.data()); Uuid entry1IconOld = Uuid::random(); dbSource->metadata()->addCustomIcon(entry1IconOld, iconImage1); entry1->setIcon(entry1IconOld); @@ -447,27 +437,24 @@ void TestGroup::testCopyCustomIcons() QCOMPARE(metaTarget->customIcon(group1Icon).pixel(0, 0), qRgb(1, 2, 3)); QCOMPARE(metaTarget->customIcon(group2Icon).pixel(0, 0), qRgb(4, 5, 6)); - - delete dbTarget; - delete dbSource; } void TestGroup::testMerge() { - Group* group1 = new Group(); + QScopedPointer<Group> group1(new Group()); group1->setName("group 1"); - Group* group2 = new Group(); + QScopedPointer<Group> group2(new Group()); group2->setName("group 2"); - Entry* entry1 = new Entry(); - Entry* entry2 = new Entry(); + QScopedPointer<Entry> entry1(new Entry()); + QScopedPointer<Entry> entry2(new Entry()); - entry1->setGroup(group1); + entry1->setGroup(group1.data()); entry1->setUuid(Uuid::random()); - entry2->setGroup(group1); + entry2->setGroup(group1.data()); entry2->setUuid(Uuid::random()); - group2->merge(group1); + group2->merge(group1.data()); QCOMPARE(group1->entries().size(), 2); QCOMPARE(group2->entries().size(), 2); @@ -475,25 +462,22 @@ void TestGroup::testMerge() void TestGroup::testMergeDatabase() { - Database* dbSource = createMergeTestDatabase(); - Database* dbDest = new Database(); + QScopedPointer<Database> dbSource(createMergeTestDatabase()); + QScopedPointer<Database> dbDest(new Database()); - dbDest->merge(dbSource); + dbDest->merge(dbSource.data()); QCOMPARE(dbDest->rootGroup()->children().size(), 2); QCOMPARE(dbDest->rootGroup()->children().at(0)->entries().size(), 2); - - delete dbDest; - delete dbSource; } void TestGroup::testMergeConflict() { - Database* dbSource = createMergeTestDatabase(); + QScopedPointer<Database> dbSource(createMergeTestDatabase()); // test merging updated entries // falls back to KeepBoth mode - Database* dbCopy = new Database(); + QScopedPointer<Database> dbCopy(new Database()); dbCopy->setRootGroup(dbSource->rootGroup()->clone(Entry::CloneNoFlags)); // sanity check @@ -505,22 +489,19 @@ void TestGroup::testMergeConflict() updatedTimeInfo.setLastModificationTime(updatedTimeInfo.lastModificationTime().addYears(1)); updatedEntry->setTimeInfo(updatedTimeInfo); - dbCopy->merge(dbSource); + dbCopy->merge(dbSource.data()); // one entry is duplicated because of mode QCOMPARE(dbCopy->rootGroup()->children().at(0)->entries().size(), 2); - - delete dbSource; - delete dbCopy; } void TestGroup::testMergeConflictKeepBoth() { - Database* dbSource = createMergeTestDatabase(); + QScopedPointer<Database> dbSource(createMergeTestDatabase()); // test merging updated entries // falls back to KeepBoth mode - Database* dbCopy = new Database(); + QScopedPointer<Database> dbCopy(new Database()); dbCopy->setRootGroup(dbSource->rootGroup()->clone(Entry::CloneNoFlags)); // sanity check @@ -534,21 +515,18 @@ void TestGroup::testMergeConflictKeepBoth() dbCopy->rootGroup()->setMergeMode(Group::MergeMode::KeepBoth); - dbCopy->merge(dbSource); + dbCopy->merge(dbSource.data()); // one entry is duplicated because of mode QCOMPARE(dbCopy->rootGroup()->children().at(0)->entries().size(), 3); // the older entry was merged from the other db as last in the group Entry* olderEntry = dbCopy->rootGroup()->children().at(0)->entries().at(2); QVERIFY2(olderEntry->attributes()->hasKey("merged"), "older entry is marked with an attribute \"merged\""); - - delete dbSource; - delete dbCopy; } Database* TestGroup::createMergeTestDatabase() { - Database* db = new Database(); + QScopedPointer<Database> db(new Database()); Group* group1 = new Group(); group1->setName("group 1"); @@ -566,12 +544,12 @@ Database* TestGroup::createMergeTestDatabase() group1->setParent(db->rootGroup()); group2->setParent(db->rootGroup()); - return db; + return db.take(); } void TestGroup::testFindEntry() { - Database* db = new Database(); + QScopedPointer<Database> db(new Database()); Entry* entry1 = new Entry(); entry1->setTitle(QString("entry1")); @@ -642,13 +620,11 @@ void TestGroup::testFindEntry() // An invalid UUID. entry = db->rootGroup()->findEntry(QString("febfb01ebcdf9dbd90a3f1579dc")); QVERIFY(entry == nullptr); - - delete db; } void TestGroup::testFindGroupByPath() { - Database* db = new Database(); + QScopedPointer<Database> db(new Database()); Group* group1 = new Group(); group1->setName("group1"); @@ -706,13 +682,11 @@ void TestGroup::testFindGroupByPath() group = db->rootGroup()->findGroupByPath("invalid"); QVERIFY(group == nullptr); - - delete db; } void TestGroup::testPrint() { - Database* db = new Database(); + QScopedPointer<Database> db(new Database()); QString output = db->rootGroup()->print(); QCOMPARE(output, QString("[empty]\n")); @@ -731,7 +705,6 @@ void TestGroup::testPrint() output = db->rootGroup()->print(true); QCOMPARE(output, QString("entry1 " + entry1->uuid().toHex() + "\n")); - Group* group1 = new Group(); group1->setName("group1"); @@ -752,5 +725,4 @@ void TestGroup::testPrint() QVERIFY(output.contains(QString("entry1 " + entry1->uuid().toHex() + "\n"))); QVERIFY(output.contains(QString("group1/ " + group1->uuid().toHex() + "\n"))); QVERIFY(output.contains(QString(" entry2 " + entry2->uuid().toHex() + "\n"))); - delete db; } diff --git a/tests/TestKeePass2Writer.cpp b/tests/TestKeePass2Writer.cpp index 9f0c87be7..f6d3f58ad 100644 --- a/tests/TestKeePass2Writer.cpp +++ b/tests/TestKeePass2Writer.cpp @@ -148,13 +148,15 @@ void TestKeePass2Writer::testRepair() KeePass2Repair repair; QFile file(brokenDbFilename); file.open(QIODevice::ReadOnly); - QCOMPARE(repair.repairDatabase(&file, key), KeePass2Repair::RepairSuccess); - Database* dbRepaired = repair.database(); + auto result = repair.repairDatabase(&file, key); + QCOMPARE(result.first, KeePass2Repair::RepairSuccess); + Database* dbRepaired = result.second; QVERIFY(dbRepaired); QCOMPARE(dbRepaired->rootGroup()->entries().size(), 1); QCOMPARE(dbRepaired->rootGroup()->entries().at(0)->username(), QString("testuser").append(QChar(0x20AC))); QCOMPARE(dbRepaired->rootGroup()->entries().at(0)->password(), QString("testpw")); + delete dbRepaired; } void TestKeePass2Writer::cleanupTestCase() diff --git a/tests/TestSymmetricCipher.cpp b/tests/TestSymmetricCipher.cpp index 4f78693d6..5242c3888 100644 --- a/tests/TestSymmetricCipher.cpp +++ b/tests/TestSymmetricCipher.cpp @@ -162,7 +162,7 @@ void TestSymmetricCipher::testTwofish256CbcEncryption() bool ok; for (int i = 0; i < keys.size(); ++i) { - cipher.init(keys[i], ivs[i]); + QVERIFY(cipher.init(keys[i], ivs[i])); QByteArray ptNext = plainTexts[i]; QByteArray ctPrev = ivs[i]; QByteArray ctCur; diff --git a/tests/gui/TestGui.cpp b/tests/gui/TestGui.cpp index 75ce3cc59..6805e1053 100644 --- a/tests/gui/TestGui.cpp +++ b/tests/gui/TestGui.cpp @@ -332,15 +332,27 @@ void TestGui::testAddEntry() QTest::keyClicks(passwordRepeatEdit, "something 2"); QTest::mouseClick(editEntryWidgetButtonBox->button(QDialogButtonBox::Ok), Qt::LeftButton); - // Add entry "something 3" + // Add entry "something 3" using the apply button then click ok QTest::mouseClick(entryNewWidget, Qt::LeftButton); QTest::keyClicks(titleEdit, "something 3"); + QTest::mouseClick(editEntryWidgetButtonBox->button(QDialogButtonBox::Apply), Qt::LeftButton); QTest::mouseClick(editEntryWidgetButtonBox->button(QDialogButtonBox::Ok), Qt::LeftButton); + // Add entry "something 4" using the apply button then click cancel + QTest::mouseClick(entryNewWidget, Qt::LeftButton); + QTest::keyClicks(titleEdit, "something 4"); + QTest::mouseClick(editEntryWidgetButtonBox->button(QDialogButtonBox::Apply), Qt::LeftButton); + QTest::mouseClick(editEntryWidgetButtonBox->button(QDialogButtonBox::Cancel), Qt::LeftButton); + + // Add entry "something 5" but click cancel button (does NOT add entry) + QTest::mouseClick(entryNewWidget, Qt::LeftButton); + QTest::keyClicks(titleEdit, "something 5"); + QTest::mouseClick(editEntryWidgetButtonBox->button(QDialogButtonBox::Cancel), Qt::LeftButton); + QApplication::processEvents(); - // Confirm that 4 entries now exist - QTRY_COMPARE(entryView->model()->rowCount(), 4); + // Confirm that 5 entries now exist + QTRY_COMPARE(entryView->model()->rowCount(), 5); } void TestGui::testPasswordEntryEntropy() @@ -513,7 +525,7 @@ void TestGui::testTotp() void TestGui::testSearch() { // Add canned entries for consistent testing - testAddEntry(); + Q_UNUSED(addCannedEntries()); QToolBar* toolBar = m_mainWindow->findChild<QToolBar*>("toolBar"); @@ -629,7 +641,7 @@ void TestGui::testSearch() void TestGui::testDeleteEntry() { // Add canned entries for consistent testing - testAddEntry(); + Q_UNUSED(addCannedEntries()); GroupView* groupView = m_dbWidget->findChild<GroupView*>("groupView"); EntryView* entryView = m_dbWidget->findChild<EntryView*>("entryView"); @@ -905,6 +917,42 @@ void TestGui::cleanupTestCase() delete m_mainWindow; } +int TestGui::addCannedEntries() +{ + int entries_added = 0; + + // Find buttons + QToolBar* toolBar = m_mainWindow->findChild<QToolBar*>("toolBar"); + QWidget* entryNewWidget = toolBar->widgetForAction(m_mainWindow->findChild<QAction*>("actionEntryNew")); + EditEntryWidget* editEntryWidget = m_dbWidget->findChild<EditEntryWidget*>("editEntryWidget"); + QLineEdit* titleEdit = editEntryWidget->findChild<QLineEdit*>("titleEdit"); + QLineEdit* passwordEdit = editEntryWidget->findChild<QLineEdit*>("passwordEdit"); + QLineEdit* passwordRepeatEdit = editEntryWidget->findChild<QLineEdit*>("passwordRepeatEdit"); + + // Add entry "test" and confirm added + QTest::mouseClick(entryNewWidget, Qt::LeftButton); + QTest::keyClicks(titleEdit, "test"); + QDialogButtonBox* editEntryWidgetButtonBox = editEntryWidget->findChild<QDialogButtonBox*>("buttonBox"); + QTest::mouseClick(editEntryWidgetButtonBox->button(QDialogButtonBox::Ok), Qt::LeftButton); + ++entries_added; + + // Add entry "something 2" + QTest::mouseClick(entryNewWidget, Qt::LeftButton); + QTest::keyClicks(titleEdit, "something 2"); + QTest::keyClicks(passwordEdit, "something 2"); + QTest::keyClicks(passwordRepeatEdit, "something 2"); + QTest::mouseClick(editEntryWidgetButtonBox->button(QDialogButtonBox::Ok), Qt::LeftButton); + ++entries_added; + + // Add entry "something 3" + QTest::mouseClick(entryNewWidget, Qt::LeftButton); + QTest::keyClicks(titleEdit, "something 3"); + QTest::mouseClick(editEntryWidgetButtonBox->button(QDialogButtonBox::Ok), Qt::LeftButton); + ++entries_added; + + return entries_added; +} + void TestGui::checkDatabase(QString dbFileName) { if (dbFileName.isEmpty()) diff --git a/tests/gui/TestGui.h b/tests/gui/TestGui.h index 904e5f21e..352dbf213 100644 --- a/tests/gui/TestGui.h +++ b/tests/gui/TestGui.h @@ -61,6 +61,7 @@ private slots: void testDatabaseLocking(); private: + int addCannedEntries(); void checkDatabase(QString dbFileName = ""); void triggerAction(const QString& name); void dragAndDropGroup(const QModelIndex& sourceIndex, const QModelIndex& targetIndex, int row, |
