Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
8437df7
test gocryptfs on travis
Germar Jul 22, 2017
48267cd
fix backintime-askpass not found
Germar Jul 22, 2017
85b8dde
fix gocryptfs stay in foreground
Germar Jul 22, 2017
c481e11
reenable all tests
Germar Jul 22, 2017
91975a4
set gocryptfs to be quiet
Germar Jul 22, 2017
ca7d7c6
typo
Germar Jul 22, 2017
c5711fc
fix settings
Germar Jul 22, 2017
3af5aeb
reenable piping gocryptfs output as the bug is fixed in https://githu…
Germar Jul 24, 2017
e73cd76
test gocryptfs on travis
Germar Jul 22, 2017
01138d1
fix gocryptfs stay in foreground
Germar Jul 22, 2017
171a7d9
reenable all tests
Germar Jul 22, 2017
ee4df40
set gocryptfs to be quiet
Germar Jul 22, 2017
7ce058e
typo
Germar Jul 22, 2017
765045e
reenable piping gocryptfs output as the bug is fixed in https://githu…
Germar Jul 24, 2017
e490e50
integrate gocrypt into Settings
Germar Apr 14, 2017
3177815
Use gocryptfs from packagemanager in Travis
daviewales Oct 15, 2024
bb09aea
Update common/gocryptfstools.py
daviewales Oct 18, 2024
1b78200
Remove explicit gettext definition
daviewales Oct 18, 2024
9bf5c04
Remove explicit gettext definition
daviewales Oct 18, 2024
ec83c46
Fix some pylint warnings
daviewales Oct 18, 2024
2ee5529
Disable pylint duplicate check for encfs module
daviewales Oct 18, 2024
0d8c5f3
Fix undefined variable
daviewales Oct 18, 2024
82cafeb
Add more gocryptfs details
daviewales Nov 29, 2024
d9a92b6
Standardise GocryptfsMount class name
daviewales Nov 29, 2024
a6f55f6
Ensure GUI elements appear for local_gocryptfs mode
daviewales Nov 29, 2024
a740e0e
fix errorHandler
buhtz Nov 30, 2024
1ca3175
Fix typo in docstring
daviewales Dec 4, 2024
8dab4d9
Rename init to init_backend
daviewales Jan 8, 2025
cf8a23a
Slightly improve code style
daviewales Jan 15, 2025
0ef4740
Add init_backend method to match gocryptfs updates
daviewales Jan 15, 2025
3fc0a41
Merge branch 'dev' into gocrypt-rebase
buhtz Dec 14, 2025
f3a06fa
Merge branch 'dev' into gocrypt-rebase
buhtz Dec 22, 2025
353b77c
[skip ci]
buhtz Dec 30, 2025
457cefd
[skip ci]
buhtz Dec 30, 2025
6777c4d
Merge branch 'dev' into gocrypt-rebase
buhtz Jan 1, 2026
11efc86
Encfs_mount.init_backend() just empty
buhtz Jan 1, 2026
11dfb7d
Merge branch 'gocrypt-rebase' of github.com:daviewales/backintime int…
buhtz Jan 1, 2026
df0941d
Merge branch 'dev' into gocrypt-rebase
buhtz Jan 3, 2026
b7bb198
Merge branch 'dev' into gocrypt-rebase
buhtz Jan 4, 2026
73cc8fb
encfs fifo docu
buhtz Jan 5, 2026
fbf3b10
more doc and encfs empty initbackend
buhtz Jan 5, 2026
e8249d6
pepification
buhtz Jan 5, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ before_install:
- sudo apt-get -qq update
# install screen, and util-linux (provides flock) for test_sshtools
- sudo apt-get install -y sshfs screen util-linux libdbus-1-dev
- sudo apt-get install -y ruby rubygems asciidoctor encfs
- sudo apt-get install -y ruby rubygems asciidoctor encfs gocryptfs
- sudo gem install asciidoctor

jobs:
Expand Down
23 changes: 19 additions & 4 deletions common/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
import logger
import sshtools
import encfstools
import gocryptfstools
import password
import pluginmanager
import schedule
Expand Down Expand Up @@ -238,7 +239,7 @@ def __init__(self, config_path=None, data_path=None):
sshtools.SSH, _('SSH'), _('SSH private key'), False),
'local_encfs': (
encfstools.EncFS_mount,
_('Local encrypted'),
_('Local encrypted') + ' (EncFS)',
_('Encryption'),
False
),
Expand All @@ -247,7 +248,13 @@ def __init__(self, config_path=None, data_path=None):
_('SSH encrypted'),
_('SSH private key'),
_('Encryption')
)
),
'local_gocryptfs':(
gocryptfstools.GocryptfsMount,
_('Local encrypted') + ' (gocryptfs)',
_('Encryption'),
False
),
}

# Deprecated: #2176
Expand Down Expand Up @@ -383,7 +390,7 @@ def get_snapshots_mountpoint(self, profile_id=None, mode=None, tmp_mount=False):
if mode == 'local':
return self.get_snapshots_path(profile_id)

# else: ssh/local_encfs/ssh_encfs
# else: ssh/local_encfs/ssh_encfs/local_gocryptfs

symlink = f'{profile_id}_{os.getpid()}'
if tmp_mount:
Expand Down Expand Up @@ -425,7 +432,7 @@ def is_mode_encrypted(self, profile_id=None):

def snapshotsMode(self, profile_id=None):
#? Use mode (or backend) for this snapshot. Look at 'man backintime'
#? section 'Modes'.;local|local_encfs|ssh|ssh_encfs
#? section 'Modes'.;local|local_encfs|ssh|ssh_encfs|local_gocryptfs
return self.profileStrValue('snapshots.mode', 'local', profile_id)

def setSnapshotsMode(self, value, profile_id = None):
Expand Down Expand Up @@ -723,6 +730,14 @@ def localEncfsPath(self, profile_id = None):
def setLocalEncfsPath(self, value, profile_id = None):
self.setProfileStrValue('snapshots.local_encfs.path', value, profile_id)

# gocryptfs
def localGocryptfsPath(self, profile_id = None):
#?Where to save snapshots in mode 'local_gocryptfs'.;absolute path
return self.profileStrValue('snapshots.local_gocryptfs.path', '', profile_id)

def setLocalGocryptfsPath(self, value, profile_id = None):
self.setProfileStrValue('snapshots.local_gocryptfs.path', value, profile_id)

def passwordSave(self, profile_id = None, mode = None):
if mode is None:
mode = self.snapshotsMode(profile_id)
Expand Down
Loading