[trafficserver] branch master updated: cdniuc is not a manditory claim

[eze]

This is an automated email from the ASF dual-hosted git repository.

eze pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/master by this push:
     new fa53771  cdniuc is not a manditory claim
fa53771 is described below

commit fa537711fec0f70916cb5fc2d6aa72590ed4708c
Author: Dylan Souza <dylan_so...@comcast.com>
AuthorDate: Fri Mar 8 17:18:48 2019 +0000

    cdniuc is not a manditory claim
    
    With Internet Draft 16 for uri signing, the cdniuc claim is not manditory. 
It
    took the place of the manditory sub claim in draft 12, and the manditory 
nature
    of the sub claim was still in effect. This change allows for tokens to not 
contain
    the cdniuc claim and also renews the cdniuc and cdnistd claim on token 
renewal.
---
 plugins/experimental/uri_signing/jwt.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/plugins/experimental/uri_signing/jwt.c 
b/plugins/experimental/uri_signing/jwt.c
index aeaa218..020d0ca 100644
--- a/plugins/experimental/uri_signing/jwt.c
+++ b/plugins/experimental/uri_signing/jwt.c
@@ -193,7 +193,12 @@ jwt_check_uri(const char *cdniuc, const char *uri)
   static const char CONT_URI_HASH_STR[]  = "hash";
   static const char CONT_URI_REGEX_STR[] = "regex";
 
-  if (!cdniuc || !*cdniuc || !uri) {
+  /* If cdniuc is not provided, skip uri check */
+  if (!cdniuc || !*cdniuc) {
+    return true;
+  }
+
+  if (!uri) {
     return false;
   }
 
@@ -292,9 +297,11 @@ renew(struct jwt *jwt, const char *iss, cjose_jwk_t *jwk, 
const char *alg, const
   renew_copy_real(new_json, "nbf", jwt->nbf);
   renew_copy_real(new_json, "iat", now()); /* issued now */
   renew_copy_string(new_json, "jti", jwt->jti);
+  renew_copy_string(new_json, "cdniuc", jwt->cdniuc);
   renew_copy_integer(new_json, "cdniv", jwt->cdniv);
   renew_copy_integer(new_json, "cdniets", jwt->cdniets);
   renew_copy_integer(new_json, "cdnistt", jwt->cdnistt);
+  renew_copy_integer(new_json, "cdnistd", jwt->cdnistd);
 
   char *pt = json_dumps(new_json, JSON_COMPACT);
   json_decref(new_json);