Commit Graph

208 Commits

Author SHA1 Message Date
Martin
376643e1e9 Keys are large enough. Reduced iterations to one 2015-12-12 02:22:22 +01:00
Martin Raiber
a84334c052 Merge branch 'dev' of 192.168.0.40:/home/git/urbackup_backend into dev
Conflicts:
	urbackupserver/FullFileBackup.cpp
	urbackupserver/ImageBackup.cpp
2015-12-11 22:22:15 +01:00
Martin Raiber
fffb7326b8 Transfer image bitmap during image backup 2015-12-11 22:19:46 +01:00
Martin
f1c7eff094 Improved clientctl command line interface and fixed creation, modified and access time backup and display 2015-12-11 20:34:05 +01:00
Martin
7e183aec19 Return timestamps as integers 2015-12-11 13:12:14 +01:00
Martin
3dfa6f859c Transfer unix timestamp to browser and format time in the browser
(cherry picked from commit caacef8cf1277c693303b6ab61a7ee70cb907554)

Conflicts:
	urbackupserver/serverinterface/backups.cpp
	urbackupserver/serverinterface/lastacts.cpp
	urbackupserver/serverinterface/logs.cpp
	urbackupserver/serverinterface/status.cpp
	urbackupserver/www/js/urbackup.js
2015-12-11 12:47:44 +01:00
Martin
93681e3e2c Use ECDSA instead of DSA when signing 2015-12-10 19:09:37 +01:00
Martin
9fa4426aa7 Prevent access token reuse 2015-12-10 18:45:23 +01:00
Martin
e90cb501ae Multiple virtual clients per real client 2015-12-09 22:53:57 +01:00
Martin
6447563c2e Merge remote-tracking branch 'urpc/next' into dev
Conflicts:
	.gitignore
	Interface/Database.h
	configure.ac_client
	configure.ac_server
	fileservplugin/CClientThread.cpp
	fileservplugin/CClientThread.h
	fileservplugin/FileServFactory.cpp
	fileservplugin/FileServFactory.h
	fileservplugin/IFileServFactory.h
	fsimageplugin/FSImageFactory.cpp
	fsimageplugin/FSImageFactory.h
	fsimageplugin/FileWrapper.cpp
	fsimageplugin/FileWrapper.h
	fsimageplugin/IFSImageFactory.h
	fsimageplugin/Makefile.am_client
	fsimageplugin/Makefile.am_server
	fsimageplugin/dllmain.cpp
	fsimageplugin/filesystem.cpp
	fsimageplugin/filesystem.h
	fsimageplugin/fs/ntfs.cpp
	fsimageplugin/fs/ntfs.h
	fsimageplugin/fs/ntfs_win.cpp
	fsimageplugin/fs/ntfs_win.h
	fsimageplugin/fs/unknown.cpp
	fsimageplugin/fs/unknown.h
	fsimageplugin/fsimageplugin.vcxproj.filters
	start_urbackup_client
	start_urbackup_server
	urbackupclient/ChangeJournalWatcher.cpp
	urbackupclient/ClientService.cpp
	urbackupclient/ClientServiceCMD.cpp
	urbackupclient/ImageThread.cpp
	urbackupclient/client.cpp
	urbackupclient/client.h
	urbackupclient/client_restore.cpp
	urbackupclient/clientdao.cpp
	urbackupclient/dllmain.cpp
	urbackupclient/win_sysvol.cpp
	urbackupclient/win_sysvol.h
	urbackupcommon/fileclient/FileClient.cpp
	urbackupcommon/fileclient/FileClientChunked.cpp
	urbackupcommon/os_functions.h
	urbackupcommon/os_functions_lin.cpp
	urbackupcommon/os_functions_win.cpp
	urbackupcommon/settingslist.cpp
	urbackupserver/ImageBackup.cpp
	urbackupserver/SQLiteFileCache.cpp
	urbackupserver/ServerDownloadThread.cpp
	urbackupserver/dao/ServerBackupDao.cpp
	urbackupserver/dao/ServerBackupDao.h
	urbackupserver/dllmain.cpp
	urbackupserver/doc/admin_guide.tex
	urbackupserver/server_channel.cpp
	urbackupserver/server_channel.h
	urbackupserver/server_cleanup.cpp
	urbackupserver/server_dir_links.cpp
	urbackupserver/server_get.cpp
	urbackupserver/server_hash.cpp
	urbackupserver/server_hash.h
	urbackupserver/server_settings.cpp
	urbackupserver/server_settings.h
	urbackupserver/server_update_stats.cpp
	urbackupserver/server_writer.cpp
	urbackupserver/serverinterface/backups.cpp
	urbackupserver/serverinterface/settings.cpp
	urbackupserver/serverinterface/usage.cpp
	urbackupserver/www/js/urbackup.js
	urbackupserver/www/templates.js
	urbackupserver/www/templates/settings_inv_row.htm
	urbackupserver/www/translations/urbackup.webinterface/ar_SA.po
2015-12-09 14:49:13 +01:00
Martin
b7a164f4a8 Store file permissions with variable length encoding 2015-12-05 19:30:02 +01:00
Martin
75604d0d61 Linux build system overhaul 2015-12-05 18:10:17 +01:00
Martin
cdd9c0ae76 Merge branch 'dev' of server.raiber.de:~/urbackup_backend into dev
Conflicts:
	urbackupserver/dllmain.cpp
2015-12-04 21:45:04 +01:00
Martin
57e6febc0d Stronger user password hashing with PBKDF2-SHA256(10000) 2015-12-04 21:43:58 +01:00
Martin
ed313f2b2e Write successful authentications and authentication failures to syslog
(cherry picked from commit 74c3957631ffcdff1ab71d57cf4ba52dead69b86)
(cherry picked from commit 51ccffc9993e183677db941530fa33d009a78e76)
2015-11-11 19:43:58 +01:00
Martin Raiber
52d7d169dd Fixed file listing via command line 2015-11-02 22:43:33 +01:00
Martin Raiber
5ce4d932ea Fixed issues with new client commandline control 2015-11-02 00:41:37 +01:00
Martin
8ae8013394 List file backups from command line 2015-11-01 20:59:43 +01:00
Martin
701058523b Get file backups and start restores from client 2015-10-31 17:35:04 +01:00
Martin
e567faee77 Refactored backup access 2015-10-30 20:53:10 +01:00
Martin
0bf2a6361f Separate functions for read and write transactions 2015-10-26 18:51:30 +01:00
Martin
5fe4723c97 Separate functions for read and write transactions 2015-10-26 18:42:39 +01:00
Martin
4a45ddd1e6 Restore file backup via restore client 2015-10-17 22:34:07 +02:00
Martin Raiber
05c5cea029 Linux backup and restore with file meta data 2015-10-11 21:17:53 +02:00
Martin
ecea174272 Fixed missing licensing headers 2015-08-08 22:53:24 +02:00
Martin
17d758bf8b Proper symbolic link handling part (1) 2015-08-08 22:40:19 +02:00
Martin
d7538f2f47 Option to not follow symbolic links on Linux
(cherry picked from commit a0343960a9)

Conflicts:
	urbackupclient/client.cpp
	urbackupclient/client.h
	urbackupcommon/settingslist.cpp
	urbackupserver/server_settings.cpp
	urbackupserver/server_settings.h
	urbackupserver/serverinterface/settings.cpp
	urbackupserver/www/js/urbackup.js
	urbackupserver/www/templates.js
	urbackupserver/www/templates/settings_inv_row.htm
2015-08-08 18:34:50 +02:00
Martin
345d182568 License change from GPLv3+ to AGPLv3+ 2015-08-01 22:58:40 +02:00
Martin
ae35dd48b8 Download common file metadata via metadata pipe 2015-08-01 22:47:32 +02:00
Martin
a0343960a9 Option to not follow symbolic links on Linux 2015-07-12 22:11:23 +02:00
Martin
52b9e403b5 Setting to run backups without background priority on Windows 2015-07-12 21:55:56 +02:00
Martin Raiber
0c49f59cf0 Fixed stopping of processes 2015-05-15 18:04:52 +02:00
Martin
fb294f04d2 Fix threading issue when recalculating statistics 2015-03-07 12:06:16 +01:00
Martin
24b81534e7 Cleanup deleted backups table each night 2015-03-04 16:35:03 +01:00
Martin
b2176f6caf Fixed metadata restore on Windows 2015-02-03 00:13:19 +01:00
Martin Raiber
ef8329ee10 Fixed metadata restore on Windows 2015-02-01 00:04:06 +01:00
Martin
91ce323b48 Restore backups from web interface 2015-01-31 08:51:08 +01:00
Martin
8e8c1aa7e9 Allow multiple concurrent processes to be reported via web interface 2015-01-26 22:41:04 +01:00
Martin
191335ef8d Restore backups from web interface 2015-01-25 23:17:49 +01:00
Martin
e31b0b109e Updated SQLite and some SQLite tuning 2015-01-08 22:31:54 +01:00
Martin
4968439836 Fixed single file downloading 2015-01-07 00:44:40 +01:00
Martin
24e7922764 Fixed file access from tray icon 2015-01-04 20:24:16 +01:00
Martin Raiber
77b21368a3 Updated translation 2014-12-26 17:09:23 +01:00
Martin Raiber
d47dd35315 Test with test user on saving LDAP settings 2014-12-26 17:01:03 +01:00
Martin Raiber
2b0fc6fa77 Only convert to Windows time on Windows 2014-12-23 16:02:01 +01:00
Martin
eada97fb5e Synthetic full image backups 2014-12-20 01:24:02 +01:00
Martin
f6d6110a15 Show percentage finished when creating files index 2014-12-18 21:06:46 +01:00
Martin
2bec823048 Use global settings if client specific settings are/remain identical to the global ones 2014-12-17 22:30:19 +01:00
Martin
68052cb22d Login via LDAP/AD 2014-12-06 20:39:55 +01:00
Martin
0787b75dc0 Put the log data in a separate table 2014-11-30 21:19:24 +01:00