95 lines
5.0 KiB
Diff
95 lines
5.0 KiB
Diff
|
From 03ab9306c70df34d7824f700d5635e8b458e6d6d Mon Sep 17 00:00:00 2001
|
||
|
|
From: Stephan Bergmann <sbergman@redhat.com>
|
||
|
|
Date: Thu, 23 Aug 2018 16:45:34 +0200
|
||
|
|
Subject: [PATCH 1/5] Related rhbz#1618703: Properly handle failure decoding
|
||
|
|
master password
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
...when e.g. FIPS mode makes PasswordContainer::DecodePasswords fail by throwing
|
||
|
|
an exception which needs to be caught in PasswordContainerHelper::addRecord (in
|
||
|
|
uui/source/passwordcontainer.cxx, but which only catches NoMasterException, not
|
||
|
|
generic RuntimeException)
|
||
|
|
|
||
|
|
Change-Id: I877bb5126e79ac2c90b11ef6d31bf81a2927f409
|
||
|
|
Reviewed-on: https://gerrit.libreoffice.org/59511
|
||
|
|
Tested-by: Jenkins
|
||
|
|
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
|
||
|
|
(cherry picked from commit e17987f4bd54fec7e0d94bdefdb94809255b3436)
|
||
|
|
Reviewed-on: https://gerrit.libreoffice.org/59568
|
||
|
|
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
|
||
|
|
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
||
|
|
(cherry picked from commit 24b3d08018b6350d5e60615eb375b337ab1b4f75)
|
||
|
|
---
|
||
|
|
svl/source/passwordcontainer/passwordcontainer.cxx | 11 ++++++-----
|
||
|
|
svl/source/passwordcontainer/passwordcontainer.hxx | 2 +-
|
||
|
|
2 files changed, 7 insertions(+), 6 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/svl/source/passwordcontainer/passwordcontainer.cxx b/svl/source/passwordcontainer/passwordcontainer.cxx
|
||
|
|
index c2e8b7100028..6d4bb02427ac 100644
|
||
|
|
--- a/svl/source/passwordcontainer/passwordcontainer.cxx
|
||
|
|
+++ b/svl/source/passwordcontainer/passwordcontainer.cxx
|
||
|
|
@@ -417,7 +417,7 @@ void SAL_CALL PasswordContainer::disposing( const EventObject& )
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
|
-std::vector< OUString > PasswordContainer::DecodePasswords( const OUString& aLine, const OUString& aMasterPasswd )
|
||
|
|
+std::vector< OUString > PasswordContainer::DecodePasswords( const OUString& aLine, const OUString& aMasterPasswd, css::task::PasswordRequestMode mode )
|
||
|
|
{
|
||
|
|
if( !aMasterPasswd.isEmpty() )
|
||
|
|
{
|
||
|
|
@@ -463,7 +463,8 @@ std::vector< OUString > PasswordContainer::DecodePasswords( const OUString& aLin
|
||
|
|
|
||
|
|
// problems with decoding
|
||
|
|
OSL_FAIL( "Problem with decoding" );
|
||
|
|
- throw RuntimeException("Can't decode!" );
|
||
|
|
+ throw css::task::NoMasterException(
|
||
|
|
+ "Can't decode!", css::uno::Reference<css::uno::XInterface>(), mode);
|
||
|
|
}
|
||
|
|
|
||
|
|
OUString PasswordContainer::EncodePasswords(const std::vector< OUString >& lines, const OUString& aMasterPasswd )
|
||
|
|
@@ -586,7 +587,7 @@ UserRecord PasswordContainer::CopyToUserRecord( const NamePassRecord& aRecord, b
|
||
|
|
{
|
||
|
|
try
|
||
|
|
{
|
||
|
|
- ::std::vector< OUString > aDecodedPasswords = DecodePasswords( aRecord.GetPersPasswords(), GetMasterPassword( aHandler ) );
|
||
|
|
+ ::std::vector< OUString > aDecodedPasswords = DecodePasswords( aRecord.GetPersPasswords(), GetMasterPassword( aHandler ), css::task::PasswordRequestMode_PASSWORD_ENTER );
|
||
|
|
aPasswords.insert( aPasswords.end(), aDecodedPasswords.begin(), aDecodedPasswords.end() );
|
||
|
|
}
|
||
|
|
catch( NoMasterException& )
|
||
|
|
@@ -848,7 +849,7 @@ OUString const & PasswordContainer::GetMasterPassword( const Reference< XInterac
|
||
|
|
}
|
||
|
|
else
|
||
|
|
{
|
||
|
|
- std::vector< OUString > aRM( DecodePasswords( aEncodedMP, aPass ) );
|
||
|
|
+ std::vector< OUString > aRM( DecodePasswords( aEncodedMP, aPass, aRMode ) );
|
||
|
|
if( aRM.empty() || aPass != aRM[0] )
|
||
|
|
{
|
||
|
|
bAskAgain = true;
|
||
|
|
@@ -1005,7 +1006,7 @@ Sequence< UrlRecord > SAL_CALL PasswordContainer::getAllPersistent( const Refere
|
||
|
|
{
|
||
|
|
sal_Int32 oldLen = aUsers.getLength();
|
||
|
|
aUsers.realloc( oldLen + 1 );
|
||
|
|
- aUsers[ oldLen ] = UserRecord( aNP.GetUserName(), comphelper::containerToSequence( DecodePasswords( aNP.GetPersPasswords(), GetMasterPassword( xHandler ) ) ) );
|
||
|
|
+ aUsers[ oldLen ] = UserRecord( aNP.GetUserName(), comphelper::containerToSequence( DecodePasswords( aNP.GetPersPasswords(), GetMasterPassword( xHandler ), css::task::PasswordRequestMode_PASSWORD_ENTER ) ) );
|
||
|
|
}
|
||
|
|
|
||
|
|
if( aUsers.getLength() )
|
||
|
|
diff --git a/svl/source/passwordcontainer/passwordcontainer.hxx b/svl/source/passwordcontainer/passwordcontainer.hxx
|
||
|
|
index 67ad63e72722..a1190549eb77 100644
|
||
|
|
--- a/svl/source/passwordcontainer/passwordcontainer.hxx
|
||
|
|
+++ b/svl/source/passwordcontainer/passwordcontainer.hxx
|
||
|
|
@@ -268,7 +268,7 @@ css::task::UrlRecord find(
|
||
|
|
const css::uno::Reference< css::task::XInteractionHandler >& Handler );
|
||
|
|
|
||
|
|
/// @throws css::uno::RuntimeException
|
||
|
|
- static ::std::vector< OUString > DecodePasswords( const OUString& aLine, const OUString& aMasterPassword );
|
||
|
|
+ static ::std::vector< OUString > DecodePasswords( const OUString& aLine, const OUString& aMasterPassword, css::task::PasswordRequestMode mode );
|
||
|
|
|
||
|
|
/// @throws css::uno::RuntimeException
|
||
|
|
static OUString EncodePasswords(const std::vector< OUString >& lines, const OUString& aMasterPassword );
|
||
|
|
--
|
||
|
|
2.17.1
|
||
|
|
|