version 0.9.6: various corrections related to packaging

Signed-off-by: Hans Zandbelt <hans.zandbelt@zmartzone.eu>

Author: zandbelt

ChangeLog

@@ -1,3 +1,7 @@
+10/02/2018
+- various corrections related to packaging
+- version 0.9.6
+
 10/01/2018
 - use non-binary security token as default WS-Trust source token
 - support adding the target token in a POST parameter (e.g. an access token) 

Makefile.in

@@ -11,6 +11,9 @@ HDRS = src/mod_sts.h
 # Files to include when making a .tar.gz-file for distribution
 DISTFILES=$(SRC) \
 	$(HDRS) \
+	test/test.c \
+	test/stub.c \
+	sts.conf \
 	configure \
 	configure.ac \
 	Makefile.in \

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([mod_sts],[0.9.5],[hans.zandbelt@zmartzone.eu])
+AC_INIT([mod_sts],[0.9.6],[hans.zandbelt@zmartzone.eu])
 
 AC_SUBST(NAMEVER, AC_PACKAGE_TARNAME()-AC_PACKAGE_VERSION())
 

src/mod_sts.c

@@ -131,7 +131,10 @@ int sts_config_check_vhost_config(apr_pool_t *pool, server_rec *s) {
 	sts_server_config *cfg = ap_get_module_config(s->module_config,
 			&sts_module);
 	int rc = OK;
-	switch (cfg->mode) {
+	int mode =
+			(cfg->mode == STS_CONFIG_POS_INT_UNSET) ?
+					STS_CONFIG_DEFAULT_STS_MODE : cfg->mode;
+	switch (mode) {
 	case STS_CONFIG_MODE_WSTRUST:
 		rc = sts_wstrust_config_check_vhost(pool, s, cfg);
 		break;
@@ -142,7 +145,7 @@ int sts_config_check_vhost_config(apr_pool_t *pool, server_rec *s) {
 		rc = sts_otx_config_check_vhost(pool, s, cfg);
 		break;
 	default:
-		sts_serror(s, "STS mode is set to unsupported value: %d", cfg->mode);
+		sts_serror(s, "STS mode is set to unsupported value: %d", mode);
 		rc = HTTP_INTERNAL_SERVER_ERROR;
 		break;
 

sts.conf

@@ -148,9 +148,11 @@
 #                                                               (can be relative to the Apache server root directory)
 #
 #STSROPCEndpointAuth [ client_secret_basic:secret=<secret>         |
-                       client_secret_post:secret=<secret>          |
-                       client_secret_jwt:secret=<secret>&aud=<aud> |
-                       client_cert:cert=<cert_file>&key=<key_file>   ]
+#                      client_secret_post:secret=<secret>          |
+#                      client_secret_jwt:secret=<secret>&aud=<aud> |
+#                      private_key_jwt:jwk=<json>[&aud=<aud>]      |
+#                      client_cert:cert=<cert_file>&key=<key_file> ]
+
 
 # (Mandatory)
 # Set the Client ID for the OAuth 2.0 ROPC token request.
@@ -202,9 +204,10 @@
 #                                                               (can be relative to the Apache server root directory)
 #
 #STSOTXEndpointAuth [ client_secret_basic:secret=<secret>         |
-                      client_secret_post:secret=<secret>          |
-                      client_secret_jwt:secret=<secret>&aud=<aud> |
-                      client_cert:cert=<cert_file>&key=<key_file>  ]
+#                     client_secret_post:secret=<secret>          |
+#                     client_secret_jwt:secret=<secret>&aud=<aud> |
+#                     private_key_jwt:jwk=<json>[&aud=<aud>]      |
+#                     client_cert:cert=<cert_file>&key=<key_file> ]
 
 # Set the Client ID for the OAuth 2.0 Token Exchange request, used in the client authentication.
 # When not defined, the default is to not use any client_id for client authentication.

test/stub.c

@@ -227,3 +227,29 @@ AP_DECLARE(void) ap_log_error_(const char *file, int line, int module_index,
 		AP_DECLARE(char *) ap_server_root_relative(apr_pool_t *p, const char *file) {
 			return "";
 		}
+
+		AP_DECLARE(int) ap_hook_insert_filter(request_rec *r) {
+			return 0;
+		}
+
+		AP_DECLARE(apr_status_t) ap_get_brigade(ap_filter_t *filter,
+		                                        apr_bucket_brigade *bucket,
+		                                        ap_input_mode_t mode,
+		                                        apr_read_type_e block,
+		                                        apr_off_t readbytes) {
+			return APR_SUCCESS;
+		}
+
+		AP_DECLARE(ap_filter_t *) ap_add_input_filter(const char *name, void *ctx,
+		                                              request_rec *r, conn_rec *c) {
+			return 0;
+		}
+
+
+		AP_DECLARE(ap_filter_rec_t *) ap_register_input_filter(const char *name,
+		                                          ap_in_filter_func filter_func,
+		                                          ap_init_filter_func filter_init,
+		                                          ap_filter_type ftype) {
+			return 0;
+		}
+

test/test.c

@@ -119,7 +119,7 @@ int main(int argc, char **argv, char **env) {
 
 	if (argc < 2) {
 		printf(" Usage: %s <access_token>\n", argv[0]);
-		exit(-1);
+		exit(0);
 	}
 
 	apr_pool_t *pool = NULL;