Browse Source

Merge pull request #191 from a1346054/fixes

License, spelling and whitespace fixes
master
mhogomchungu 4 weeks ago
committed by GitHub
parent
commit
0fd7ad84b5
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 8
      GPLv3
  2. 2
      LINUX_BUILD_INSTRUCTIONS
  3. 4
      OSX_BUILD_INSTRUCTIONS
  4. 22
      changelog
  5. 3
      cmake_uninstall.cmake.in
  6. 4
      custom backends/README
  7. 2
      rpm/BUILD_INSTRUCTIONS
  8. 2
      src/checkforupdates.cpp
  9. 2
      src/checkforupdates.h
  10. 4
      src/configoptions.cpp
  11. 2
      src/dialogmsg.cpp
  12. 14
      src/engines.cpp
  13. 2
      src/engines/cryfs.cpp
  14. 2
      src/engines/cryfs.h
  15. 2
      src/engines/encfs.cpp
  16. 2
      src/engines/encfscreateoptions.cpp
  17. 2
      src/favorites.cpp
  18. 2
      src/favorites.h
  19. 4
      src/favorites2.cpp
  20. 16
      src/keydialog.cpp
  21. 4
      src/keydialog.h
  22. 4
      src/mountinfo.cpp
  23. 2
      src/processManager.cpp
  24. 2
      src/secrets.h
  25. 4
      src/settings.cpp
  26. 6
      src/sirikali.cpp
  27. 2
      src/sirikali.h
  28. 2
      src/siripolkit/CMakeLists.txt
  29. 2
      src/siripolkit/zulupolkit.cpp
  30. 4
      src/siritask.cpp
  31. 2
      src/systemsignalhandler.h
  32. 2
      src/utility.cpp

8
GPLv3

@ -1,7 +1,7 @@
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
@ -645,7 +645,7 @@ the "copyright" line and a pointer to where the full notice is found.
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/>.
along with this program. If not, see <https://www.gnu.org/licenses/>.
Also add information on how to contact you by electronic and paper mail.
@ -664,11 +664,11 @@ might be different; for a GUI interface, you would use an "about box".
You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU GPL, see
<http://www.gnu.org/licenses/>.
<https://www.gnu.org/licenses/>.
The GNU General Public License does not permit incorporating your program
into proprietary programs. If your program is a subroutine library, you
may consider it more useful to permit linking proprietary applications with
the library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. But first, please read
<http://www.gnu.org/philosophy/why-not-lgpl.html>.
<https://www.gnu.org/licenses/why-not-lgpl.html>.

2
LINUX_BUILD_INSTRUCTIONS

@ -62,7 +62,7 @@ use a system installed version if found.
-DNONETWORKSUPPORT=true
This options tells the build process to add QNetwork support. Set this option to true if you do not want SiriKali to
connect to the internet to check for backend updates. SiriKali will not automatically connect to the internet
without user consent. This option was added because some versions of Qt crashes some versions of gcc
without user consent. This option was added because some versions of Qt crashes some versions of gcc
when encountering QNetworkAccessManager class.
Build errors/test failures/feature requests/recommendations can be reported at: https://github.com/mhogomchungu/SiriKali/issues

4
OSX_BUILD_INSTRUCTIONS

@ -27,13 +27,13 @@ Below are instructions on how to build SiriKali on OSX.
8. export CMAKE_PREFIX_PATH=/usr/local/opt/qt5/
# Then you'll be able to compile Sirikali to $HOME/sirikali
9. cmake -DCMAKE_INSTALL_PREFIX=$HOME/sirikali -DQT5=true -DCMAKE_BUILD_TYPE=RELEASE . ..
# Compile using all available logical cores
# Compile using all available logical cores
10. make -j$(sysctl -n hw.ncpu)
11. make install
12. "install" SiriKali by just dragging it (in the Finder) from the directory you
compiled it in to the "Application" directory.
Note:
Note:
If you encounter errors such as:
/usr/local/include/QtCore/qglobal.h:667:43: error: no template named 'is_arithmetic_v' in namespace 'std'; did you mean

22
changelog

@ -36,12 +36,12 @@ version 1.0.0
-- Add a convenient "HMAC+KeyFile" option to use a keyfile with an empty passphrase
as a volume password. "Key+KeyFile" option is to be used if volume passphrase is to be a combination
of a password and a keyfile. Both of these two options are better than using a "KeyFile" option
because keyfiles will most likely be trancated on the first new line character encountered and al the
because keyfiles will most likely be truncated on the first new line character encountered and al the
contents of the keyfile may not be used leading to weak passphrase.
version 1.1.0
-- Add ability to automount favorites volumes on program start up time.
-- Add ability to automount favorites volumes when they become available ie,when the files systems the volume
-- Add ability to automount favorites volumes when they become available i.e. when the files systems the volume
resides in is mounted.
version 1.2.0
@ -50,9 +50,9 @@ version 1.2.0
version 1.2.1
-- Maintanance release.
-- FIX BUG: Dont generate an update warning prompt on startup when auto check for updates is set but the application
-- FIX BUG: Don't generate an update warning prompt on startup when auto check for updates is set but the application
is started while the system has no internet connection.
-- FIX BUG: Dont auto delete mount folders when a volumes was unmounted outside of SiriKali.
-- FIX BUG: Don't auto delete mount folders when a volumes was unmounted outside of SiriKali.
-- FIX BUG: Populate $PATH variable properly before calling backends since some backends fails without it.
-- FIX BUG: The build process failed to build on Qt4
@ -89,7 +89,7 @@ version 1.2.7
version 1.2.8
-- Add a GUI way to set options when creating a securefs volume.
-- Add a GUI way to set options when creating a cryfs volume.
-- Agg a GUI way to display gocryptfs volume properties.
-- Add a GUI way to display gocryptfs volume properties.
-- Better mount/unmount events monitoring on OSX.
-- Set it as a run time option(off by default) to support ecryptfs-simple backend that does not have suid bit set. A user
will be asked to allow polkit support on first attempt.
@ -166,7 +166,7 @@ version 1.3.9(August 01,2019)
-- Add ability to run user created custom backends/extensions. This feature make it possible to configure SiriKali
to run any tool that deals with mounting file systems. Documentation on how to create a custom backed is
here: https://github.com/mhogomchungu/sirikali/wiki/How-to-create-SiriKali-custom-backend
-- Fix an occassional crash that happens when creating an internal wallet when an internal version of
-- Fix an occasional crash that happens when creating an internal wallet when an internal version of
lxqt_wallet is in use.
version 1.4.0(October 01,2019)
@ -174,7 +174,7 @@ version 1.4.0(October 01,2019)
-- Add a config option to show favorites entries on the tray icon context menu with an ability to
mount/unmount volume from the menu.
-- Fix a bug that prevented favorite entries with cipher path that starts with a dot from showing up in the GUI.
-- Add GUI options to enable HiDPI option to scale the GUI when runing in HiDPI displays.
-- Add GUI options to enable HiDPI option to scale the GUI when running in HiDPI displays.
version 1.4.1(October 15,2019)
-- Add support for fscrypt backend. This backend will allow encrypting individual folders that reside in a
@ -189,7 +189,7 @@ version 1.4.2(December 18,2019)
is a remote address of "abc@example:/".
-- Add a visible option to choose between creating a local drive or a network drive when connecting to ssh server
on windows.
-- Inforce a requirenment that says Sshfs-win should be atleast version 3.4.0.
-- Enforce a requirement that says Sshfs-win should be at least version 3.4.0.
-- Add support for "lock" command in fscrypt backend. This option is used for locking directories that use V2
encryption policies.
@ -213,7 +213,7 @@ version 1.4.2(December 18,2019)
-- Fix a bug that causes fscrypt folders paths that contain a space character from showing up in the GUI.
-- Prevent fscrypt error when creating a new volume with an already taken protector name by making sure
we are using a unique protector name.
-- Add a GUI option to set protector's name when creating fscrypt volume.
-- Add a GUI option to set protector's name when creating fscrypt volume.
-- Add a GUI option to choose between using a custom passphrase,login passphrase or a key file
when creating fscrypt volume.
-- Add support for fscrypt keyfile.
@ -230,13 +230,13 @@ version 1.4.2(December 18,2019)
version 1.4.5(August 01,2020)
[ALL]
-- Make it compile with Qt 5.15.0 without warnings(remove Qt's deprecated APIs).
-- Make it compile with Qt 5.15.0 without warnings(remove Qt's deprecated APIs).
-- Declare backend API to be stable and provide a few examples backends.
SiriKali now supports custom backends that can be added by users by providing json based
configuration files and place them in either "$HOME/.config/SiriKali/backends" or in
"$INSTALL_PREFIX/share/SiriKali/backends". Look in "custom backends" folder for
more information.
-- Fix a bug that caused SiriKali to attempt to auto unlock not available favorite volume at startup.
-- Fix a bug that caused SiriKali to attempt to auto unlock not available favorite volume at startup.
-- Fix a bug that caused SiriKali to delay showing up in GNOME or any other DE that does not use
system tray functionality.

3
cmake_uninstall.cmake.in

@ -1,6 +1,6 @@
cmake_policy(SET CMP0007 NEW)
if (NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
message(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"")
endif(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
@ -23,4 +23,3 @@ foreach (file ${files})
message(STATUS "File \"$ENV{DESTDIR}${file}\" does not exist.")
endif (EXISTS "$ENV{DESTDIR}${file}")
endforeach(file)

4
custom backends/README

@ -1,7 +1,7 @@
To create a custom backend using a GUI, press "CTRL+B" while SiriKali has focus to
get a GUI window that will allow you to create a custom backend confuguration file.
The file will be created in user's home folder in Linux and Macos in user's desktop
get a GUI window that will allow you to create a custom backend configuration file.
The file will be created in user's home folder in Linux and macOS in user's desktop
folder in Windows.
Manual changes to the configuration file may be necessary to further customise

2
rpm/BUILD_INSTRUCTIONS

@ -1,5 +1,5 @@
ps: copy and paste all given commands to make sure you dont mistype them.
ps: copy and paste all given commands to make sure you don't mistype them.
ps: at step 5,replace "1.4.7" to SiriKali version you are building.
ps: these instructions assumes rpm build directory is at "~/rpmbuild".
Modify the paths in step 5 if they are different in your distribution.

2
src/checkforupdates.cpp

@ -1,4 +1,4 @@
/*
/*
*
* Copyright (c) 2015
* name : Francis Banyikwa

2
src/checkforupdates.h

@ -83,7 +83,7 @@ private:
#include "checkforupdateswindow.h"
class checkUpdates
{
{
public:
static bool hasNetworkSupport()
{

4
src/configoptions.cpp

@ -1,4 +1,4 @@
/*
/*
*
* Copyright (c) 2017
* name : Francis Banyikwa
@ -67,7 +67,7 @@ configOptions::configOptions( QWidget * parent,
connect( m_ui->cbAutoCheckForUpdates,&QCheckBox::toggled,[ this ]( bool e ){
m_settings.autoCheck( e ) ;
} ) ;
} ) ;
connect( m_ui->cbStartMinimized,&QCheckBox::toggled,[ this ]( bool e ){

2
src/dialogmsg.cpp

@ -229,7 +229,7 @@ int DialogMsg::ShowUIYesNo( const QString& title,const QString& msg )
return dialogok( m_parent,this,true,false,title,msg ).Show() ;
}
int DialogMsg::ShowUIYesNoDefaultNo( const QString& title,const QString& msg )
int DialogMsg::ShowUIYesNoDefaultNo( const QString& title,const QString& msg )
{
return dialogok( m_parent,this,true,true,title,msg ).Show() ;
}

14
src/engines.cpp

@ -75,7 +75,7 @@ static QStringList _search_path( const QStringList& m )
if( utility::platformIsWindows() ){
auto x = _search_path_0( a + "\\bin\\" ) ;
auto x = _search_path_0( a + "\\bin\\" ) ;
x += _search_path_0( QDir().currentPath() ) ;
x += _search_path_0( settings::instance().windowsExecutableSearchPath() + "\\" ) ;
@ -348,7 +348,7 @@ static QStringList _resolve( const resolveStruct& r )
_replace_opts( mm,"%{cipherFolder}",[ & ]( replace s ){
s.set( r.args.cipherFolder ) ;
s.set( r.args.cipherFolder ) ;
} ) ;
_replace_opts( mm,"%{mountPoint}",[ & ]( replace s ){
@ -566,7 +566,7 @@ const QProcessEnvironment& engines::engine::getProcessEnvironment() const
return m_processEnvironment ;
}
utility2::LOGLEVEL engines::engine::allowLogging( const QStringList& args ) const
utility2::LOGLEVEL engines::engine::allowLogging( const QStringList& args ) const
{
Q_UNUSED( args )
return utility2::LOGLEVEL::COMMAND_AND_UNLOCK_DURATION ;
@ -714,7 +714,7 @@ engines::engine::terminateProcess( const engines::engine::terminate_process& e )
}else{
return _failed_to_finish( std::move( exe ),std::move( args ) ) ;
}
}
}
utility::logger logger ;
@ -1555,7 +1555,7 @@ engines::engine::ownsCipherFolder engines::engine::ownsCipherPath( const QString
if( _found( this->configFileNames(),ee ) ){
return { true,cipherPath,configFilePath } ;
}else{
}else{
auto a = "[[[" + this->name() + "]]]" ;
if( configFilePath.startsWith( a ) ){
@ -1974,7 +1974,7 @@ engines::engine::args::args( const engines::engine::cmdArgsList& m,
const QStringList& l ) :
cmd( c ),
cipherPath( m.cipherFolder ),
mountPath( m.mountPoint ),
mountPath( m.mountPoint ),
mode( s.mode() ),
subtype( s.subType() ),
cmd_args( l ),
@ -2264,7 +2264,7 @@ void engines::booleanCache::silenceWarning()
}
void engines::exeFullPath::silenceWarning()
{
{
}
template< typename ... T >

2
src/engines/cryfs.cpp

@ -176,7 +176,7 @@ void cryfs::updateOptions( engines::engine::cmdArgsList& e,bool creating ) const
engines::engine::status cryfs::passAllRequirenments( const engines::engine::cmdArgsList& opt ) const
{
auto s = engines::engine::passAllRequirenments( opt ) ;
auto s = engines::engine::passAllRequirenments( opt ) ;
if( s != engines::engine::status::success ){

2
src/engines/cryfs.h

@ -37,7 +37,7 @@ public:
void GUICreateOptions( const createGUIOptions& ) const override ;
void GUIMountOptions( const mountGUIOptions& ) const override ;
private:
private:
QProcessEnvironment setEnv() const ;
const QProcessEnvironment m_env ;
const engines::versionGreaterOrEqual m_version_greater_or_equal_0_10_0 ;

2
src/engines/encfs.cpp

@ -86,7 +86,7 @@ static engines::engine::BaseOptions _setOptions()
encfs::encfs() :
engines::engine( _setOptions() ),
m_environment( engines::engine::getProcessEnvironment() )
{
{
}
engines::engine::args encfs::command( const QByteArray& password,

2
src/engines/encfscreateoptions.cpp

@ -37,7 +37,7 @@ encfscreateoptions::encfscreateoptions( const engines::engine::createGUIOptions&
connect( m_ui->pbOK,SIGNAL( clicked() ),this,SLOT( pbOK() ) ) ;
connect( m_ui->pbCancel,SIGNAL( clicked() ),this,SLOT( pbCancel() ) ) ;
m_ui->plainTextEdit->appendPlainText( tr( "Normally EncFS provides a plaintext view of data on demand: it stores enciphered data and displays plaintext data. With this option set, it takes as source plaintext data and produces enciphered data on-demand. This can be useful for creating remote encrypted backups, where you do not wish to keep the local files unencrypted." ) ) ;
m_ui->plainTextEdit->appendPlainText( tr( "Normally EncFS provides a plaintext view of data on demand: it stores enciphered data and displays plaintext data. With this option set, it takes as source plaintext data and produces enciphered data on-demand. This can be useful for creating remote encrypted backups, where you do not wish to keep the local files unencrypted." ) ) ;
this->show() ;
}

2
src/favorites.cpp

@ -1,4 +1,4 @@
/*
/*
*
* Copyright ( c ) 2011-2015
* name : Francis Banyikwa

2
src/favorites.h

@ -1,4 +1,4 @@
/*
/*
*
* Copyright ( c ) 2011-2015
* name : Francis Banyikwa

4
src/favorites2.cpp

@ -1175,7 +1175,7 @@ void favorites2::updateFavorite( bool edit )
bool likeSsh = false ;
auto dev_path = [ & ](){
auto dev_path = [ & ](){
if( type.isEmpty() ){
@ -1407,7 +1407,7 @@ void favorites2::HideUI()
}
void favorites2::checkFavoritesConsistency()
{
{
}
utility2::result_ref< const favorites::entry& > favorites2::getEntry( int row )

16
src/keydialog.cpp

@ -1,4 +1,4 @@
/*
/*
*
* Copyright (c) 2012-2015
* name : Francis Banyikwa
@ -220,8 +220,8 @@ void keyDialog::setUpInitUI()
if( utility::platformIsWindows() ){
/*
* We are diabling this functionality on windows for now
* its currently not possible to open a volume in read only mode.
* We are disabling this functionality on windows for now
* it's currently not possible to open a volume in read only mode.
*/
m_ui->checkBoxOpenReadOnly->setChecked( false ) ;
m_ui->checkBoxOpenReadOnly->setEnabled( false ) ;
@ -475,7 +475,7 @@ void keyDialog::setUpVolumeProperties( const keyDialog::entry& ee )
const auto& e = ee.volEntry.favorite() ;
m_path = e.volumePath ;
m_mountOptions = e ;
m_favoriteReadOnly = e.readOnlyMode ;
m_favoriteReadOnly = e.readOnlyMode ;
if( m_favoriteReadOnly.defined() ){
@ -772,7 +772,7 @@ void keyDialog::textChanged( QString e )
m_ui->lineEditMountPoint->setText( e ) ;
auto r = m_ui->lineEditFolderPath->text() ;
auto r = m_ui->lineEditFolderPath->text() ;
auto l = r.lastIndexOf( '/' ) ;
@ -814,7 +814,7 @@ void keyDialog::enableAll()
{
m_ui->pbMountPoint->setEnabled( true ) ;
m_ui->pbMountPoint_1->setEnabled( true ) ;
m_ui->pbOptions->setEnabled( true ) ;
m_ui->pbOptions->setEnabled( true ) ;
m_ui->label_2->setEnabled( true ) ;
m_ui->pbOpenFolderPath->setEnabled( true ) ;
m_ui->pbCancel->setEnabled( true ) ;
@ -1011,7 +1011,7 @@ void keyDialog::pbOpen()
}
}else{
/*
* We shouldnt get here
* We shouldn't get here
*/
return this->openVolume() ;
}
@ -1067,7 +1067,7 @@ void keyDialog::reportErrorMessage( const engines::engine::cmdStatus& s )
m_ui->checkBoxOpenReadOnly->setChecked( false ) ;
}
}
}
this->showErrorMessage( s ) ;
}

4
src/keydialog.h

@ -1,4 +1,4 @@
/*
/*
*
* Copyright (c) 2012-2015
* name : Francis Banyikwa
@ -285,7 +285,7 @@ private slots:
void pbSetKeyKeyFile( void ) ;
void pbSetKey( void ) ;
void pbSetKeyCancel( void ) ;
private :
private :
void key( void ) ;
void yubiKey( void ) ;
void secretStorage( void ) ;

4
src/mountinfo.cpp

@ -1,4 +1,4 @@
/*
/*
*
* Copyright (c) 2012-2015
* name : Francis Banyikwa
@ -460,7 +460,7 @@ void mountinfo::linuxMonitor()
}else if( a == 0 ){
/*
* Timout has occurred
* Timeout has occurred
*/
}else{
m_debug( "Warning: pollMonitor.poll failed" ) ;

2
src/processManager.cpp

@ -101,7 +101,7 @@ static result _read( QProcess& exe,const engines::engine& engine,Function functi
break ;
}
}
}
}
return { r,std::move( m ) } ;
}

2
src/secrets.h

@ -141,7 +141,7 @@ public:
} ;
walletKey getKey( const QString& keyID,QWidget * widget = nullptr ) ;
private:
private:
struct info{
QString walletName ;

4
src/settings.cpp

@ -720,7 +720,7 @@ bool settings::startMinimized()
return m_settings.value( "StartMinimized" ).toBool() ;
}else{
bool s = false ;
bool s = false ;
m_settings.setValue( "StartMinimized",s ) ;
@ -973,7 +973,7 @@ void settings::autoMountBackEnd( const settings::walletBackEnd& e )
return "windows_DPAPI" ;
}else{
return "none" ;
return "none" ;
}
}() ) ;
}

6
src/sirikali.cpp

@ -1,4 +1,4 @@
/*
/*
*
* Copyright (c) 2012-2015
* name : Francis Banyikwa
@ -540,8 +540,8 @@ void sirikali::showTrayIcon()
}else if( counter == 5 ){
/*
* The tray doesnt seem to be ready yet but we cant wait any
* longer,just display it and hope for the best.
* The tray doesn't seem to be ready yet but we cant wait any
* longer, just display it and hope for the best.
*/
utility::debug() << "TimeOut Waiting For System Tray to Become Available" ;

2
src/sirikali.h

@ -1,4 +1,4 @@
/*
/*
*
* Copyright (c) 2012-2015
* name : Francis Banyikwa

2
src/siripolkit/CMakeLists.txt

@ -5,7 +5,7 @@ include_directories( ${PROJECT_BINARY_DIR}/siripoltik/ )
if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 10.0.0 )
set( CMAKE_CXX_STANDARD 20 )
elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 10.0.0)
elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 10.0.0)
set( CMAKE_CXX_STANDARD 20 )
else()
set( CMAKE_CXX_STANDARD 14 )

2
src/siripolkit/zulupolkit.cpp

@ -1,4 +1,4 @@
/*
/*
*
* Copyright ( c ) 2017
* name : Francis Banyikwa

4
src/siritask.cpp

@ -217,7 +217,7 @@ engines::engine::cmdStatus siritask::encryptedFolderUnMount( const siritask::unm
return s ;
}else{
return _unmount( { e.cipherFolder,e.mountPoint,e.engine,e.numberOfAttempts } ) ;
return _unmount( { e.cipherFolder,e.mountPoint,e.engine,e.numberOfAttempts } ) ;
}
}
@ -526,7 +526,7 @@ static engines::engine::cmdStatus _create( const siritask::create& s )
static void _warning( const QString& e )
{
auto a = "ERROR!!\n " + e + "siritask::encryptedFolderMount is" ;
auto a = "ERROR!!\n " + e + "siritask::encryptedFolderMount is" ;
auto b = "running from a background thread" ;
utility::debug() << a + b ;

2
src/systemsignalhandler.h

@ -31,7 +31,7 @@ public:
void setHandle( std::function< void( systemSignalHandler::signal ) > function ) ;
void addSignal( systemSignalHandler::signal SIG ) ;
systemSignalHandler( QObject * parent ) ;
private:
private:
};
#endif

2
src/utility.cpp

@ -112,7 +112,7 @@ bool utility::platformIsOSX()
bool utility::platformIsWindows()
{
return false ;
return false ;
}
#endif

Loading…
Cancel
Save