- {{abbreviatedError(addr)}}
+ {{addr}}
+ {{abbreviatedError(addr)}}
{{addr}}
diff --git a/gui/default/syncthing/core/syncthingController.js b/gui/default/syncthing/core/syncthingController.js index ee23d4c85..3c0c42b73 100755 --- a/gui/default/syncthing/core/syncthingController.js +++ b/gui/default/syncthing/core/syncthingController.js @@ -769,6 +769,7 @@ angular.module('syncthing.core') $scope.currentSharing.shared = []; $scope.currentSharing.unrelated = []; $scope.currentSharing.selected = {}; + $scope.currentSharing.encryptionPasswords = {}; if (editing === 'folder') { initShareEditingFolder(); } @@ -779,6 +780,9 @@ angular.module('syncthing.core') if (n.deviceID !== $scope.myID) { $scope.currentSharing.shared.push($scope.devices[n.deviceID]); } + if (n.encryptionPassword !== '') { + $scope.currentSharing.encryptionPasswords[n.deviceID] = n.encryptionPassword; + } $scope.currentSharing.selected[n.deviceID] = true; }); $scope.currentSharing.unrelated = $scope.deviceList().filter(function (n) { @@ -903,9 +907,12 @@ angular.module('syncthing.core') if ($scope.hasFailedFiles(folderCfg.id)) { return 'faileditems'; } - if (folderInfo.receiveOnlyTotalItems) { + if ($scope.hasReceiveOnlyChanged(folderCfg)) { return 'localadditions'; } + if ($scope.hasReceiveEncryptedItems(folderCfg)) { + return 'localunencrypted'; + } if (folderCfg.devices.length <= 1) { return 'unshared'; } @@ -928,7 +935,7 @@ angular.module('syncthing.core') if (status === 'unknown') { return 'info'; } - if (status === 'stopped' || status === 'outofsync' || status === 'error' || status === 'faileditems') { + if (status === 'stopped' || status === 'outofsync' || status === 'error' || status === 'faileditems' || status === 'localunencrypted') { return 'danger'; } if (status === 'unshared' || status === 'scan-waiting' || status === 'sync-waiting' || status === 'clean-waiting') { @@ -1553,6 +1560,13 @@ angular.module('syncthing.core') $scope.deviceFolders($scope.currentDevice).forEach(function (folderID) { $scope.currentSharing.shared.push($scope.folders[folderID]); $scope.currentSharing.selected[folderID] = true; + var folderdevices = $scope.folders[folderID].devices; + for (var i = 0; i < folderdevices.length; i++) { + if (folderdevices[i].deviceID === deviceCfg.deviceID) { + $scope.currentSharing.encryptionPasswords[folderID] = folderdevices[i].encryptionPassword; + break; + } + } }); $scope.currentSharing.unrelated = $scope.folderList().filter(function (n) { return !$scope.currentSharing.selected[n.id]; @@ -1656,6 +1670,8 @@ angular.module('syncthing.core') for (i = 0; i < $scope.folders[id].devices.length; i++) { if ($scope.folders[id].devices[i].deviceID === currentID) { found = true; + // Update encryption pw + $scope.folders[id].devices[i].encryptionPassword = $scope.currentSharing.encryptionPasswords[id]; break; } } @@ -1664,6 +1680,7 @@ angular.module('syncthing.core') // Add device to folder $scope.folders[id].devices.push({ deviceID: currentID, + encryptionPassword: $scope.currentSharing.encryptionPasswords[id], }); } } else { @@ -1822,19 +1839,32 @@ angular.module('syncthing.core') }); $scope.setFSWatcherIntervalDefault = function () { - var defaultRescanIntervals = [60, 3600]; + var defaultRescanIntervals = [60, 3600, 3600*24]; if (defaultRescanIntervals.indexOf($scope.currentFolder.rescanIntervalS) === -1) { return; } var idx; if ($scope.currentFolder.fsWatcherEnabled) { idx = 1; + } else if ($scope.currentFolder.type === 'receiveencrypted') { + idx = 2; } else { idx = 0; } $scope.currentFolder.rescanIntervalS = defaultRescanIntervals[idx]; }; + $scope.setDefaultsForFolderType = function () { + if ($scope.currentFolder.type === 'receiveencrypted') { + $scope.currentFolder.fsWatcherEnabled = false; + $scope.currentFolder.ignorePerms = true; + delete $scope.currentFolder.versioning; + } else { + $scope.currentFolder.fsWatcherEnabled = true; + } + $scope.setFSWatcherIntervalDefault(); + }; + $scope.loadFormIntoScope = function (form) { console.log('loadFormIntoScope', form.$name); switch (form.$name) { @@ -1853,6 +1883,7 @@ angular.module('syncthing.core') function editFolderModal() { initVersioningEditing(); + $scope.currentFolder._recvEnc = $scope.currentFolder.type === 'receiveencrypted'; $scope.folderPathErrors = {}; $scope.folderEditor.$setPristine(); $('#editFolder').modal().one('shown.bs.tab', function (e) { @@ -2003,6 +2034,13 @@ angular.module('syncthing.core') }; $scope.currentSharing.selected[device] = true; $scope.currentFolder.label = pendingFolder.offeredBy[device].label; + for (var k in pendingFolder.offeredBy) { + if (pendingFolder.offeredBy[k].receiveEncrypted) { + $scope.currentFolder.type = "receiveencrypted"; + $scope.setDefaultsForFolderType(); + break; + } + } editFolderModal(); }); }; @@ -2039,6 +2077,7 @@ angular.module('syncthing.core') var newDevices = []; folderCfg.devices.forEach(function (dev) { if ($scope.currentSharing.selected[dev.deviceID] === true) { + dev.encryptionPassword = $scope.currentSharing.encryptionPasswords[dev.deviceID]; newDevices.push(dev); delete $scope.currentSharing.selected[dev.deviceID]; }; @@ -2046,7 +2085,8 @@ angular.module('syncthing.core') for (var deviceID in $scope.currentSharing.selected) { if ($scope.currentSharing.selected[deviceID] === true) { newDevices.push({ - deviceID: deviceID + deviceID: deviceID, + encryptionPassword: $scope.currentSharing.encryptionPasswords[deviceID], }); } } @@ -2473,23 +2513,40 @@ angular.module('syncthing.core') return $scope.model[folder].errors !== 0; }; - $scope.showLocalChanged = function (folder) { + $scope.showLocalChanged = function (folder, folderType) { $scope.localChangedFolder = folder; + $scope.localChangedType = folderType; $scope.localChanged = $scope.refreshLocalChanged(1, 10); $('#localChanged').modal().one('hidden.bs.modal', function () { $scope.localChanged = {}; $scope.localChangedFolder = undefined; + $scope.localChangedType = undefined; }); }; - $scope.canRevert = function (folder) { - var f = $scope.model[folder]; - if (!f) { + $scope.hasReceiveOnlyChanged = function (folderCfg) { + if (!folderCfg || folderCfg.type !== "receiveonly") { return false; } - return $scope.model[folder].receiveOnlyTotalItems > 0; + var counts = $scope.model[folderCfg.id]; + return counts && counts.receiveOnlyTotalItems > 0; }; + $scope.hasReceiveEncryptedItems = function (folderCfg) { + if (!folderCfg || folderCfg.type !== "receiveencrypted") { + return false; + } + return $scope.receiveEncryptedItemsCount(folderCfg) > 0; + }; + + $scope.receiveEncryptedItemsCount = function (folderCfg) { + var counts = $scope.model[folderCfg.id]; + if (!counts) { + return 0; + } + return counts.receiveOnlyTotalItems - counts.receiveOnlyChangedDeletes; + } + $scope.revertOverride = function () { $http.post( urlbase + "/db/" + $scope.revertOverrideParams.operation +"?folder=" @@ -2734,4 +2791,23 @@ angular.module('syncthing.core') address.indexOf('unix://') == 0 || address.indexOf('unixs://') == 0); } + }) + .directive('shareTemplate', function () { + return { + templateUrl: 'syncthing/core/editShareTemplate.html', + scope: { + selected: '=', + encryptionPasswords: '=', + id: '@', + label: '@', + folderType: '@', + untrusted: '=', + }, + link: function(scope, elem, attrs) { + var plain = false; + scope.togglePasswordVisibility = function() { + scope.plain = !scope.plain; + }; + }, + } }); diff --git a/gui/default/syncthing/device/editDeviceModalView.html b/gui/default/syncthing/device/editDeviceModalView.html index b7672e96b..7a776b710 100644 --- a/gui/default/syncthing/device/editDeviceModalView.html +++ b/gui/default/syncthing/device/editDeviceModalView.html @@ -63,50 +63,30 @@ -
- Deselect folders to stop sharing with this device. - Select All - Deselect All -
-+ Deselect folders to stop sharing with this device. + Select All + Deselect All +
+- Select additional folders to share with this device. - Select All - Deselect All -
-- There are no folders to share with this device. -
-+ Select additional folders to share with this device. + Select All + Deselect All +
++ There are no folders to share with this device. +
+All folders shared with this device must be protected by a password, such that all sent data is unreadable without the given password.
+Deselect devices to stop sharing this folder with. Select All Deselect All
-Select additional devices to share this folder with. @@ -75,14 +69,8 @@
There are no devices to share this folder with.
-- The interval, in seconds, for running cleanup in the versions directory. Zero to disable periodic cleaning. + The interval, in seconds, for running cleanup in the versions directory. Zero to disable periodic cleaning. The cleanup interval cannot be blank. The interval must be a positive number of seconds.
@@ -217,13 +205,17 @@
Disables comparing and syncing file permissions. Useful on systems with nonexistent or custom permissions (e.g. FAT, exFAT, Synology, Android).
diff --git a/gui/default/syncthing/transfer/localChangedFilesModalView.html b/gui/default/syncthing/transfer/localChangedFilesModalView.html
index 0a670f3ef..2ca483163 100644
--- a/gui/default/syncthing/transfer/localChangedFilesModalView.html
+++ b/gui/default/syncthing/transfer/localChangedFilesModalView.html
@@ -1,8 +1,12 @@
-
+
The following items were changed locally.
+ The following unexpected items were found.
+ You should never add or change anything locally in a "{%receiveEncrypted%}" folder.
+
- The Syncthing admin interface is configured to allow remote access without a password.
- This can easily give hackers access to read and change any files on your computer.
- Please set a GUI Authentication User and Password in the Settings dialog.
- The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.
-
- Device "{%name%}" ({%device%} at {%address%}) wants to connect. Add new device?
-
-
-
- {%device%} wants to share folder "{%folder%}".
-
-
- {%device%} wants to share folder "{%folderlabel%}" ({%folder%}).
-
- Share this folder?
- Add new folder?
-
- {{err.when | date:"yyyy-MM-dd HH:mm:ss"}}:
-
-
- For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't. Support
-
- The following items were changed locally.
-
- The following unexpected items were found.
- You should never add or change anything locally in a "{%receiveEncrypted%}" folder.
-
diff --git a/gui/default/untrusted/index.html b/gui/default/untrusted/index.html
deleted file mode 100644
index fc009128e..000000000
--- a/gui/default/untrusted/index.html
+++ /dev/null
@@ -1,958 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Danger!
-
-
-
- Restart Needed
-
-
-
-
-
- New Folder
- Share Folder
- {{ offeringDevice.time | date:"yyyy-MM-dd HH:mm:ss" }}
-
-
-
- Notice
-
-
-
- Filesystem Watcher Errors
-
-
-
-
-
- {{folderLabel(id)}} {{err}}
- Folders
-
-
-
-
-
- Folder ID
- {{folder.id}}
-
-
- Folder Path
-
- {{folder.path}}
-
-
-
- Error
- {{model[folder.id].invalid || model[folder.id].error}}
-
-
- Global State
-
-
- {{model[folder.id].globalFiles | alwaysNumber | localeNumber}}
- {{model[folder.id].globalDirectories | alwaysNumber | localeNumber}}
- ~{{model[folder.id].globalBytes | binary}}B
-
-
-
-
- Local State
-
-
- {{model[folder.id].localFiles | alwaysNumber | localeNumber}}
- {{model[folder.id].localDirectories | alwaysNumber | localeNumber}}
- ~{{model[folder.id].localBytes | binary}}B
-
Reduced by ignore patterns
-
-
-
- Out of Sync Items
-
- {{model[folder.id].needTotalItems | alwaysNumber | localeNumber}} items, ~{{model[folder.id].needBytes | binary}}B
-
-
-
- Scan Time Remaining
-
- ~ {{scanRemaining(folder.id)}}
-
-
-
- Failed Items
-
-
- {{model[folder.id].pullErrors | alwaysNumber | localeNumber}} items
-
-
-
- Locally Changed Items
-
- {{model[folder.id].receiveOnlyTotalItems | alwaysNumber | localeNumber}} items, ~{{model[folder.id].receiveOnlyChangedBytes | binary}}B
-
-
-
- Locally Changed Items
-
- {{receiveEncryptedItemsCount(folder) | alwaysNumber | localeNumber}} items, ~{{model[folder.id].receiveOnlyChangedBytes | binary}}B
-
-
-
- Folder Type
-
- Send Only
- Receive Only
- Receive Encrypted
-
-
-
- Ignore Permissions
-
- Yes
-
-
-
- Rescans
-
-
-
-
- File Pull Order
-
- Random
- Alphabetic
- Smallest First
- Largest First
- Oldest First
- Newest First
-
-
-
- File Versioning
-
- Trash Can File Versioning
- Staggered File Versioning
- Simple File Versioning
- External File Versioning
-
-
-
- Shared With
- {{sharesFolder(folder)}}
-
-
- Last Scan
- Never
-
- {{folderStats[folder.id].lastScan | date:'yyyy-MM-dd HH:mm:ss'}}
-
-
-
-
- Latest Change
-
-
- Updated
- Deleted
- {{folderStats[folder.id].lastFile.filename | basename}}
-
-
-
- This Device
- Remote Devices
-
-
-
-
-
- Last seen
- Never
- {{deviceStats[deviceCfg.deviceID].lastSeen | date:"yyyy-MM-dd HH:mm:ss"}}
-
-
- Download Rate
-
-
- {{connections[deviceCfg.deviceID].inbps | binary}}B/s
- {{connections[deviceCfg.deviceID].inbps*8 | metric}}bps
- ({{connections[deviceCfg.deviceID].inBytesTotal | binary}}B)
-
-
- Limit:
- {{deviceCfg.maxRecvKbps*1024 | binary}}B/s
- {{deviceCfg.maxRecvKbps*1024*8 | metric}}bps
-
-
-
-
-
- Upload Rate
-
-
- {{connections[deviceCfg.deviceID].outbps | binary}}B/s
- {{connections[deviceCfg.deviceID].outbps*8 | metric}}bps
- ({{connections[deviceCfg.deviceID].outBytesTotal | binary}}B)
-
-
- Limit:
- {{deviceCfg.maxSendKbps*1024 | binary}}B/s
- {{deviceCfg.maxSendKbps*1024*8 | metric}}bps
-
-
-
-
-
- Out of Sync Items
-
- {{completion[deviceCfg.deviceID]._needItems | alwaysNumber | localeNumber}} items, ~{{completion[deviceCfg.deviceID]._needBytes | binary}}B
-
-
-
- Address
-
-
- {{deviceAddr(deviceCfg)}}
-
-
-
-
- {{addr}}
-
- {{abbreviatedError(addr)}}
-
-
- {{addr}}
- {{abbreviatedError(addr)}}
-
-
-
- Connection Type
- {{connections[deviceCfg.deviceID].type}}
-
-
- Allowed Networks
-
- {{deviceCfg.allowedNetworks.join(", ")}}
-
-
-
- Compression
-
- All Data
- Off
-
-
-
- Introducer
- Yes
-
-
- Introduced By
- {{ deviceName(devices[deviceCfg.introducedBy]) || deviceCfg.introducedBy.substring(0, 5) }}
-
-
- Version
- {{connections[deviceCfg.deviceID].clientVersion}}
-
-
- Folders
- {{deviceFolders(deviceCfg).map(folderLabel).join(", ")}}
-
-
-
- Remote GUI
-
-
- {{remoteGUIAddress(deviceCfg)}}
- Unknown
-
-
-
-
-
-
-
- Path
- Size
-
-
- {{file.name}}
- {{file.size | binary}}B
-
-
-
-
-
-