felixfoertsch/syncthing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 10 Wiki Activity

all: Add untrusted folders behind feature flag (ref #62) (#7055)

Browse Source
This commit is contained in:
Simon Frei
2020-11-09 15:33:32 +01:00
committed by GitHub
parent 4db5ea5893
commit 31559e908b
59 changed files with 6952 additions and 1111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
proto/lib/config/deviceconfiguration.proto
+1
View File
@@ -24,4 +24,5 @@ message DeviceConfiguration {
repeated ObservedFolder ignored_folders = 14;
repeated ObservedFolder pending_folders = 15;
int32 max_request_kib = 16 [(ext.goname) = "MaxRequestKiB", (ext.xml) = "maxRequestKiB", (ext.json) = "maxRequestKiB"];
bool untrusted = 17;
}
proto/lib/config/folderconfiguration.proto
+3 -2
View File
@@ -14,8 +14,9 @@ import "lib/fs/copyrangemethod.proto";
import "ext.proto";
message FolderDeviceConfiguration {
bytes device_id = 1 [(ext.goname) = "DeviceID", (ext.xml) = "id,attr", (ext.json) = "deviceID", (ext.device_id) = true];
bytes introduced_by = 2 [(ext.xml) = "introducedBy,attr", (ext.device_id) = true];
bytes device_id = 1 [(ext.goname) = "DeviceID", (ext.xml) = "id,attr", (ext.json) = "deviceID", (ext.device_id) = true];
bytes introduced_by = 2 [(ext.xml) = "introducedBy,attr", (ext.device_id) = true];
string encryption_password = 3;
}
message FolderConfiguration {
proto/lib/config/foldertype.proto
+4 -3
View File
@@ -7,7 +7,8 @@ import "repos/protobuf/gogoproto/gogo.proto";
enum FolderType {
option (gogoproto.goproto_enum_stringer) = false;
FOLDER_TYPE_SEND_RECEIVE = 0;
FOLDER_TYPE_SEND_ONLY = 1;
FOLDER_TYPE_RECEIVE_ONLY = 2;
FOLDER_TYPE_SEND_RECEIVE = 0;
FOLDER_TYPE_SEND_ONLY = 1;
FOLDER_TYPE_RECEIVE_ONLY = 2;
FOLDER_TYPE_RECEIVE_ENCRYPTED = 3;
}
proto/lib/config/optionsconfiguration.proto
+1
View File
@@ -56,6 +56,7 @@ message OptionsConfiguration {
int32 max_concurrent_incoming_request_kib = 47 [(ext.goname) = "RawMaxCIRequestKiB", (ext.xml) = "maxConcurrentIncomingRequestKiB", (ext.json) = "maxConcurrentIncomingRequestKiB"];
bool announce_lan_addresses = 48 [(ext.goname)= "AnnounceLANAddresses", (ext.xml) = "announceLANAddresses", (ext.json) = "announceLANAddresses", (ext.default) = "true"];
bool send_full_index_on_upgrade = 49;
repeated string feature_flags = 50;
// Legacy deprecated
proto/lib/db/structs.proto
+1
View File
@@ -30,6 +30,7 @@ message FileInfoTruncated {
// repeated BlockInfo Blocks = 16
string symlink_target = 17;
bytes blocks_hash = 18;
bytes encrypted = 19;
protocol.FileInfoType type = 2;
uint32 permissions = 4;
int32 modified_ns = 11;
proto/lib/protocol/bep.proto
+3
View File
@@ -66,6 +66,7 @@ message Device {
bool introducer = 7;
uint64 index_id = 8 [(ext.goname) = "IndexID", (ext.gotype) = "IndexID"];
bool skip_introduction_removals = 9;
bytes encryption_password_token = 10;
}
enum Compression {
@@ -101,6 +102,7 @@ message FileInfo {
repeated BlockInfo blocks = 16;
string symlink_target = 17;
bytes blocks_hash = 18;
bytes encrypted = 19;
FileInfoType type = 2;
uint32 permissions = 4;
int32 modified_ns = 11;
@@ -156,6 +158,7 @@ message Request {
bytes hash = 6;
bool from_temporary = 7;
uint32 weak_hash = 8;
int32 block_no = 9;
}
// Response