all: Add untrusted config for devices #6787
Conversation
imsodin
changed the title
| <div class="form-group col-md-6"> | ||
| <input type="checkbox" id="untrusted" ng-model="currentDevice.untrusted" /> | ||
| <label for="untrusted" translate>Untrusted</label> | ||
| <p translate class="help-block">All folders shared with this device must be protected by a password, such that all sent data is encrypted.</p> |
There was a problem hiding this comment.
such that all sent data is unreadable without the given password?
Encrypted might just mean TLS...
|
Is this good to merge into the main encryption branch? |
| @@ -30,6 +30,7 @@ type DeviceConfiguration struct { | |||
| IgnoredFolders []ObservedFolder `xml:"ignoredFolder" json:"ignoredFolders"` | |||
| PendingFolders []ObservedFolder `xml:"pendingFolder" json:"pendingFolders"` | |||
| MaxRequestKiB int `xml:"maxRequestKiB" json:"maxRequestKiB"` | |||
| Untrusted bool `xml:"untrusted" json:"untrusted"` | |||
There was a problem hiding this comment.
Could add UR stats straight away :D
lib/ur/contract/contract.go
Outdated
| @@ -237,6 +241,8 @@ func (r *Report) FieldPointers() []interface{} { | |||
| &r.FolderUsesV3.AlwaysWeakHash, &r.FolderUsesV3.CustomWeakHashThreshold, | |||
| &r.FolderUsesV3.FsWatcherEnabled, | |||
|
|
|||
| &r.DeviceUsesV3.Untrusted, | |||
There was a problem hiding this comment.
This is not needed, but if you're adding it, you should also add the column name,
There was a problem hiding this comment.
Ah yeah right, lazily searched for the wrong term (FolderUsesV3).instead of trying to understand. Why not necessary though?
There was a problem hiding this comment.
This was used for reading columns, and inserting into json tables. The migration is done, we don't have the data that was behind those columns.
There was a problem hiding this comment.
Removed it. Maybe that code should be pruned or moved to a file with "legacy" in its name just to make it clear?
There was a problem hiding this comment.
Agree, we can delete the code given the migration is done, I guess unless someone builds from source, or does a major version jump on their own UR server.
st-review
added
the
frozen-due-to-age
PR for the encryption branch
Adds an
Untrustedconfig option to devices. If set it ensures that no data is sent to that device without being encrypted.The first commit is a convenience change: We already do keep folder configs as a map in $scope, now we do the same for devices.