obtain ROPC username from env variable STS_ROPC_USERNAME

bump to version 0.9.7

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

Author: zandbelt

ChangeLog

@@ -1,3 +1,7 @@
+05/17/2019
+- obtain ROPC username from environment variable STS_ROPC_USERNAME if set
+- version 0.9.7
+
 10/02/2018
 - various corrections related to packaging
 - version 0.9.6

configure.ac

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

src/ropc.c

@@ -54,6 +54,8 @@
 #define STS_ROPC_USERNAME         "username"
 #define STS_ROPC_PASSWORD         "password"
 
+#define STS_ROPC_USERNAME_ENV_VAR "STS_ROPC_USERNAME"
+
 int sts_ropc_config_check_vhost(apr_pool_t *pool, server_rec *s,
 		sts_server_config *cfg) {
 	if (cfg->ropc_endpoint == NULL) {
@@ -94,6 +96,10 @@ static const char * sts_ropc_get_client_id(request_rec *r) {
 static const char * sts_ropc_get_username(request_rec *r) {
 	sts_server_config *cfg = (sts_server_config *) ap_get_module_config(
 			r->server->module_config, &sts_module);
+	const char *username = apr_table_get(r->subprocess_env,
+			STS_ROPC_USERNAME_ENV_VAR);
+	if (username != NULL)
+		return username;
 	if (cfg->ropc_username == NULL)
 		// return the client_id by default
 		return sts_ropc_get_client_id(r);