Merge remote-tracking branch 'upstream/master' into master

rrooij · rrooij · commit 7baa8bd100d1 · 2020-11-13T18:19:52.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,4 @@
 /*.dylib
 /src/*.o
+Dockerfile
+jwt_io.so
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: registry.gitlab.com/canbican/jwt_io:7.7.16.1libjwt
+image: registry.gitlab.com/canbican/jwt_io:0.0.3
 
 test:
   script:
diff --git a/.gitlab-ci.yml.in b/.gitlab-ci.yml.in
@@ -0,0 +1,6 @@
+image: registry.gitlab.com/canbican/jwt_io:VERSION
+
+test:
+  script:
+    - /sbin/ldconfig
+    - make check
diff --git a/Dockerfile b/Dockerfile
diff --git a/Dockerfile.in b/Dockerfile.in
@@ -0,0 +1,7 @@
+FROM swipl:DOCKER_SWIPL
+LABEL maintainer "Can Bican <can@bican.net>"
+LABEL version="VERSION"
+RUN apt-get update
+RUN apt-get install -qq -y gcc make dh-autoreconf wget pkg-config libssl-dev git libgpm2
+RUN wget https://github.com/akheron/jansson/archive/vDOCKER_JANSSON.tar.gz && tar xvzfp vDOCKER_JANSSON.tar.gz && cd jansson-DOCKER_JANSSON && autoreconf -i && ./configure && make && make install && cd .. && rm -rf jansson-DOCKER_JANSSON vDOCKER_JANSSON.tar.gz
+RUN wget https://github.com/benmcollins/libjwt/archive/vDOCKER_LIBJWT.tar.gz && tar xvzfp vDOCKER_LIBJWT.tar.gz && cd libjwt-DOCKER_LIBJWT && autoreconf -i && ./configure && make && make install && cd .. && rm -rf vDOCKER_LIBJWT.tar.gz libjwt-DOCKER_LIBJWT
diff --git a/Makefile b/Makefile
@@ -1,6 +1,10 @@
 version   := $(shell swipl -s pack.pl -g 'version(X), writeln(X).' -t halt)
 packname  := $(shell basename $$(pwd))
 
+DOCKER_SWIPL=8.1.12
+DOCKER_JANSSON=2.12
+DOCKER_LIBJWT=1.12.0
+
 JWTLDFLAGS=$(shell pkg-config --libs libjwt)
 JWTCFLAGS=$(shell pkg-config --cflags libjwt)
 SSLLDFLAGS=-lssl -lcrypto
@@ -34,12 +38,11 @@ install:
 FORCE:
 
 clean:
-	rm -f src/$(LIBNAME).o $(LIBNAME).$(LIBEXT)
-	-rmdir src
+	rm -f src/$(LIBNAME).o $(LIBNAME).$(LIBEXT) Dockerfile .gitlab-ci.yml
 
 make_tgz: FORCE
 	rm -f ../$(packname)-$(version).tgz
-	find ../$(packname) -name '*.pl' -o -name '*.plt' -o -name '*.pem' -o -name 'rs.*' -o -name 'test_file*' -o -name LICENSE -o -name Makefile -o -name '*.c' -o -name '*.h'|sed -e 's/^...//'|xargs tar cvzfp ../$(packname)-$(version).tgz -C ..
+	find ../$(packname) -name '*.pl' -o -name '*.plt' -o -name '*.pem' -o -name 'rs*' -o -name 'test_file*' -o -name LICENSE -o -name Makefile -o -name '*.c' -o -name '*.h'|sed -e 's/^...//'|xargs tar cvzfp ../$(packname)-$(version).tgz -C ..
 
 release: check make_tgz clean releasebranch
 	mv -n ../$(packname)-$(version).tgz .
@@ -49,7 +52,17 @@ release: check make_tgz clean releasebranch
 releasebranch: FORCE
 	git checkout releases
 
-dockerimage: FORCE
-	docker build -t registry.gitlab.com/canbican/jwt_io .
-	docker push registry.gitlab.com/canbican/jwt_io
+dockerimage: FORCE Dockerfile
+	docker build -t registry.gitlab.com/canbican/jwt_io:$(version) .
+	docker push registry.gitlab.com/canbican/jwt_io:$(version)
+
+Dockerfile: Dockerfile.in
+	sed -e 's/DOCKER_SWIPL/$(DOCKER_SWIPL)/g' \
+		  -e 's/DOCKER_JANSSON/$(DOCKER_JANSSON)/g' \
+			-e 's/DOCKER_LIBJWT/$(DOCKER_LIBJWT)/g' \
+			-e 's/VERSION/$(version)/g' \
+			< $< > $@
 
+.gitlab-ci.yml: .gitlab-ci.yml.in
+	sed -e 's/VERSION/$(version)/g' \
+			< $< > $@
diff --git a/keys/rs2.key b/keys/rs2.key
@@ -0,0 +1,49 @@
+-----BEGIN OPENSSH PRIVATE KEY-----
+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
+dT8ZN8t4vHUAAAALY2FuQGNhbmRlc2s=
+-----END OPENSSH PRIVATE KEY-----
diff --git a/keys/rs2.key.pub b/keys/rs2.key.pub
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQD4AhBo93fEkEg2DiL1zfTKrcO0Trx41UqNX8TWKlNOteVYABzVdfD1PA69h1FfLTILMLQ9PhLqbuQoN1L2R8XT6a6ug+SNjtCA/K5EbuMkbpusQOFaunyCkcwzv8iTFXTxPsiJ4WYCZ+kFTDCCUkjC+6eSQRVQeSEgXA13XiqLnLs6HnW0gAVokeIySgFjSXOnWKkcP7rA74UwU/djCsFdRXzKuadM0Qk9UCmvZ82PJjd9IdzL282RvnIfHJ3pg2JKaKRMmSEAtOaG1iMeRGPOnwVmeyzdBF/d0HYBxALmFlGJPOuO9Vanclf3INRk5yjDgZKoS6ufWzOxagr+gVCizhke3cnoXhcRG5Dc3JtCOjmcl6IoPUwD1peIPTzz+seci7Yyhm5ciFAdkHR9Zd2C6fv2HhQSsVo7yD3k8cekodb1lvWNmT2PN5Td5ivKMNVv/49JS5o+6VOalNrajadVvznTo9Uu+tAYdZbPcqcaVBF7MEiKPbUusYy9+8GiD0DzzdfwhqCiM6mS/XezhytfXubZKSpvAkkQ1tKYR8/9vSCHCVJTtIdgbq29S0Yodu9lA/wuj52f6YfMW2J1WwgUQPfC12bQXLr2isey4mvXFe2+MZKJ15rWLR+YPPVj9bmnoBm5GEFlkzOOD/yJ7s4wlTN47Rgjuswt1VBikxPI+w== can@candesk
diff --git a/pack.pl b/pack.pl
@@ -1,4 +1,6 @@
 name(jwt_io).
 title('JWT implementation').
-version('0.0.2').
+version('0.0.3').
 author('Can Bican','can@bican.net').
+author('Robin De Rooij','robin@terminusdb.com').
+maintainer('Can Bican','can@bican.net').
diff --git a/src/jwt_io.c b/src/jwt_io.c
@@ -16,30 +16,33 @@ static void get_pl_arg_str(char *predicate_name, char *term_name, term_t term, c
     }
 }
 
-static foreign_t pl_jwt_encode(term_t in, term_t out, term_t key_term, term_t algorithm, term_t key_id) {
-    jwt_t *jwt;
-    char *result, *grants, *alg_str, *key, *kid;
-    int	rval;
+static		foreign_t
+pl_jwt_encode(term_t in, term_t out, term_t key_term, term_t algorithm, term_t key_id)
+{
+	jwt_t          *jwt;
+	char           *result, *grants, *alg_str, *key, *kid;
+	int		rval;
 
-    get_pl_arg_str("jwt_encode_from_string/4", "in", in, &grants);
-    get_pl_arg_str("jwt_encode_from_string/4", "key", key_term, &key);
-    get_pl_arg_str("jwt_encode_from_string/4", "kid", key_id, &kid);
-    get_pl_arg_str("jwt_encode_from_string/4", "algorithm", algorithm, &alg_str);
-    jwt_new(&jwt);
-    jwt_add_grants_json(jwt, grants);
-    jwt_add_header(jwt, "kid", kid);
-    jwt_set_alg(jwt, jwt_str_alg(alg_str), (const unsigned char *)key, strlen(key));
-    result = jwt_encode_str(jwt);
-    rval = PL_unify_atom_chars(out, result);
-    free(result);
-    jwt_free(jwt);
-    return rval;
+	get_pl_arg_str("jwt_encode_from_string/5", "in", in, &grants);
+	get_pl_arg_str("jwt_encode_from_string/5", "key", key_term, &key);
+        get_pl_arg_str("jwt_encode_from_string/5", "kid", key_id, &kid);
+	get_pl_arg_str("jwt_encode_from_string/5", "algorithm", algorithm, &alg_str);
+	jwt_new(&jwt);
+	jwt_add_grants_json(jwt, grants);
+        jwt_add_header(jwt, "kid", kid);
+	jwt_set_alg(jwt, jwt_str_alg(alg_str), (const unsigned char *)key, strlen(key));
+	result = jwt_encode_str(jwt);
+	rval = PL_unify_atom_chars(out, result);
+	free(result);
+	jwt_free(jwt);
+	return rval;
 }
 
-static foreign_t pl_jwt_parse_head(term_t in, term_t head_term) {
-    char *input, *head_payload;
-    jwt_t *jwt;
-    int	jwt_result;
+static		foreign_t
+pl_jwt_parse_head(term_t in, term_t head_term) {
+    char        *input, *head_payload;
+    jwt_t       *jwt;
+    int		jwt_result;
     get_pl_arg_str("jwt_encode_from_string/4", "in", in, &input);
 
     jwt_result = jwt_decode(&jwt, input, NULL, 0);
@@ -55,34 +58,38 @@ static foreign_t pl_jwt_parse_head(term_t in, term_t head_term) {
     }
 }
 
-static foreign_t pl_jwt_decode(term_t in, term_t out_payload, term_t out_algorithm, term_t in_key) {
-    char *input, *key, *payload;
-    const char *algorithm;
-    int jwt_result;
-    jwt_t *jwt;
+static		foreign_t
+pl_jwt_decode(term_t in, term_t out_payload, term_t out_algorithm, term_t in_key)
+{
+	char           *input, *key, *payload;
+	const char     *algorithm;
+	int		jwt_result;
+	jwt_t          *jwt;
 
-    get_pl_arg_str("jwt_encode_from_string/4", "in", in, &input);
-    get_pl_arg_str("jwt_encode_from_string/4", "key", in_key, &key);
-    if (key == NULL || !strcmp("", key)) {
-        jwt_result = jwt_decode(&jwt, input, NULL, 0);
-    } else {
-        jwt_result = jwt_decode(&jwt, input, (const unsigned char *)key, strlen(key));
-    }
-    if (!jwt_result) {
-        payload = jwt_get_grants_json(jwt, NULL);
-        algorithm = jwt_alg_str(jwt_get_alg(jwt));
-        (void) PL_unify_atom_chars(out_payload, payload);
-        (void) PL_unify_atom_chars(out_algorithm, algorithm);
-        free(payload);
-        jwt_free(jwt);
-        PL_succeed;
-    } else {
-        PL_fail;
-    }
+	get_pl_arg_str("jwt_encode_from_string/4", "in", in, &input);
+	get_pl_arg_str("jwt_encode_from_string/4", "key", in_key, &key);
+	if (key == NULL || !strcmp("", key)) {
+		jwt_result = jwt_decode(&jwt, input, NULL, 0);
+	} else {
+		jwt_result = jwt_decode(&jwt, input, (const unsigned char *)key, strlen(key));
+	}
+	if (!jwt_result) {
+		payload = jwt_get_grants_json(jwt, NULL);
+		algorithm = jwt_alg_str(jwt_get_alg(jwt));
+		(void) PL_unify_atom_chars(out_payload, payload);
+		(void) PL_unify_atom_chars(out_algorithm, algorithm);
+		free(payload);
+		jwt_free(jwt);
+		PL_succeed;
+	} else {
+    PL_fail;
+  }
 }
 
-install_t install(void) {
-    PL_register_foreign("jwt_parse_head", 2, pl_jwt_parse_head, 0);
-    PL_register_foreign("jwt_encode_from_string", 5, pl_jwt_encode, 0);
-    PL_register_foreign("jwt_decode_from_string", 4, pl_jwt_decode, 0);
+install_t
+install(void)
+{
+	PL_register_foreign("jwt_parse_head", 2, pl_jwt_parse_head, 0);
+	PL_register_foreign("jwt_encode_from_string", 5, pl_jwt_encode, 0);
+	PL_register_foreign("jwt_decode_from_string", 4, pl_jwt_decode, 0);
 }
diff --git a/tests/jwt_io_jwt.plt b/tests/jwt_io_jwt.plt
@@ -80,3 +80,5 @@ test(aud) :- set_setting(jwt_io:audience, "testaudnot"), jwt_encode('hmac256', _
 test(jti) :- jwt_encode('hmac256', _{sub: 'a'}, X), jwt_decode(X, _, []).
 test(jti, fail) :- jwt_encode('hmac256', _{sub: 'a'}, X), jwt_decode(X, Y, []), jwt_decode(X, Y, []).
 test(jti, fail) :- jwt_encode('hmac256', _{sub: 'a'}, X), jwt_decode(X, Y, []), not(jwt_decode(X, Y, [])), jwt_decode(X, Y, []).
+
+:- end_tests(jwt_io).
diff --git a/tests/jwt_io_pubpri.plt b/tests/jwt_io_pubpri.plt
@@ -0,0 +1,37 @@
+:- begin_tests(jwt_io).
+
+:- use_module(library(settings)).
+:- use_module(library(http/json)).
+
+:- use_module(prolog/jwt_io).
+
+:- set_setting(jwt_io:clock_tolerance, 30).
+
+test(pubpri_success, Sub == "a") :-
+  set_setting(jwt_io:keys, [k{kid: 'rsa256', type: 'RSA', algorithm: 'RS256', key: 'keys/rs.key', public_key: 'keys/rs.key.pub'}]),
+  jwt_encode('rsa256', _{sub:'a'}, X),
+  jwt_decode(X, Y, []),
+  atom_json_dict(Y, Result, []),
+  Sub = Result.get(sub).
+
+test(pubpri_fail, fail) :-
+  set_setting(jwt_io:keys, [k{kid: 'rsa256', type: 'RSA', algorithm: 'RS256', key: 'keys/rs.key', public_key: 'keys/rs.key.pub'}]),
+  jwt_encode('rsa256', _{sub:'a'}, X),
+  set_setting(jwt_io:keys, [k{kid: 'rsa256', type: 'RSA', algorithm: 'RS256', key: 'keys/rs2.key', public_key: 'keys/rs2.key.pub'}]),
+  jwt_decode(X, _, []).
+
+test(pubonly_success, Sub == "a") :-
+  set_setting(jwt_io:keys, [k{kid: 'rsa256', type: 'RSA', algorithm: 'RS256', key: 'keys/rs.key', public_key: 'keys/rs.key.pub'}]),
+  jwt_encode('rsa256', _{sub:'a'}, X),
+  set_setting(jwt_io:keys, [k{kid: 'rsa256', type: 'RSA', algorithm: 'RS256', public_key: 'keys/rs.key.pub'}]),
+  jwt_decode(X, Y, []),
+  atom_json_dict(Y, Result, []),
+  Sub = Result.get(sub).
+
+test(pubonly_fail, fail) :-
+  set_setting(jwt_io:keys, [k{kid: 'rsa256', type: 'RSA', algorithm: 'RS256', key: 'keys/rs.key', public_key: 'keys/rs.key.pub'}]),
+  jwt_encode('rsa256', _{sub:'a'}, X),
+  set_setting(jwt_io:keys, [k{kid: 'rsa256', type: 'RSA', algorithm: 'RS256', public_key: 'keys/rs2.key.pub'}]),
+  jwt_decode(X, _, []).
+
+:- end_tests(jwt_io).
diff --git a/tests/jwt_io_unit.plt b/tests/jwt_io_unit.plt
@@ -66,3 +66,5 @@ test(jwt_nbf_valid) :- jwt_io:jwt_nbf_valid(_{}).
 test(jwt_nbf_valid) :- get_time(Now), jwt_io:jwt_nbf_valid(_{nbf: Now}).
 test(jwt_nbf_valid, fail) :- get_time(Now), Then is Now + 500000, jwt_io:jwt_nbf_valid(_{nbf: Then}).
 test(jwt_nbf_valid) :- get_time(Now), Then is Now - 500000, jwt_io:jwt_nbf_valid(_{nbf: Then}).
+
+:- end_tests(jwt_io_unit).

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-image: registry.gitlab.com/canbican/jwt_io:7.7.16.1libjwt`
	`1`	`+image: registry.gitlab.com/canbican/jwt_io:0.0.3`
`2`	`2`
`3`	`3`	`test:`
`4`	`4`	`script:`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQD4AhBo93fEkEg2DiL1zfTKrcO0Trx41UqNX8TWKlNOteVYABzVdfD1PA69h1FfLTILMLQ9PhLqbuQoN1L2R8XT6a6ug+SNjtCA/K5EbuMkbpusQOFaunyCkcwzv8iTFXTxPsiJ4WYCZ+kFTDCCUkjC+6eSQRVQeSEgXA13XiqLnLs6HnW0gAVokeIySgFjSXOnWKkcP7rA74UwU/djCsFdRXzKuadM0Qk9UCmvZ82PJjd9IdzL282RvnIfHJ3pg2JKaKRMmSEAtOaG1iMeRGPOnwVmeyzdBF/d0HYBxALmFlGJPOuO9Vanclf3INRk5yjDgZKoS6ufWzOxagr+gVCizhke3cnoXhcRG5Dc3JtCOjmcl6IoPUwD1peIPTzz+seci7Yyhm5ciFAdkHR9Zd2C6fv2HhQSsVo7yD3k8cekodb1lvWNmT2PN5Td5ivKMNVv/49JS5o+6VOalNrajadVvznTo9Uu+tAYdZbPcqcaVBF7MEiKPbUusYy9+8GiD0DzzdfwhqCiM6mS/XezhytfXubZKSpvAkkQ1tKYR8/9vSCHCVJTtIdgbq29S0Yodu9lA/wuj52f6YfMW2J1WwgUQPfC12bQXLr2isey4mvXFe2+MZKJ15rWLR+YPPVj9bmnoBm5GEFlkzOOD/yJ7s4wlTN47Rgjuswt1VBikxPI+w== can@candesk