api,is,as: Add validation rules for URL and URI fields

TheThingsNetwork · Mar 21, 2019 · f81c576 · f81c576
1 parent 787dd74
commit f81c576
Show file tree

Hide file tree

Showing 9 changed files with 271 additions and 234 deletions.
diff --git a/api/applicationserver_web.proto b/api/applicationserver_web.proto
@@ -37,7 +37,7 @@ message ApplicationWebhook {
   google.protobuf.Timestamp updated_at = 3 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true];
 
   // Base URL to which the message's path is appended.
-  string base_url = 4 [(gogoproto.customname) = "BaseURL"];
+  string base_url = 4 [(gogoproto.customname) = "BaseURL", (validate.rules).string.uri = true];
   // HTTP headers to use.
   map<string,string> headers = 5;
   // The format to use for the body.

diff --git a/api/oauth.proto b/api/oauth.proto
@@ -57,7 +57,7 @@ message OAuthAuthorizationCode {
   ClientIdentifiers client_ids = 2 [(gogoproto.customname) = "ClientIDs", (gogoproto.nullable) = false, (validate.rules).message.required = true];
   repeated Right rights = 3;
   string code = 4;
-  string redirect_uri = 5 [(gogoproto.customname) = "RedirectURI"];
+  string redirect_uri = 5 [(gogoproto.customname) = "RedirectURI", (validate.rules).string.uri_ref = true];
   string state = 6;
   google.protobuf.Timestamp created_at = 7 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true];
   google.protobuf.Timestamp expires_at = 8 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true];

diff --git a/api/user.proto b/api/user.proto
@@ -79,7 +79,7 @@ message Picture {
   Embedded embedded = 1;
 
   // URLs of the picture for different sizes, if available on a CDN.
-  map<uint32,string> sizes = 2;
+  map<uint32,string> sizes = 2 [(validate.rules).map.values.string.uri_ref = true];
 }
 
 message Users {

diff --git a/pkg/ttnpb/applicationserver_web.pb.go b/pkg/ttnpb/applicationserver_web.pb.go
diff --git a/pkg/ttnpb/applicationserver_web.pb.validate.go b/pkg/ttnpb/applicationserver_web.pb.validate.go