From: erickson <erickson@9efc2488-bf62-4759-914b-345cdb29e865>
Date: Thu, 20 Apr 2006 19:52:03 +0000 (+0000)
Subject: gateway now requires a list of allowed services
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=75d935f7979efe6a1f1d75565c5d3e02f813439e;p=opensrf%2Fbjwebb.git

gateway now requires a list of allowed services
all other service requests will receive a not_found


git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@700 9efc2488-bf62-4759-914b-345cdb29e865
---

diff --git a/examples/opensrf_core.xml.example b/examples/opensrf_core.xml.example
index 6a82325..7ca6bcd 100644
--- a/examples/opensrf_core.xml.example
+++ b/examples/opensrf_core.xml.example
@@ -43,6 +43,18 @@
 			<domain>127.0.0.1</domain>
 		</domains>
 
+		<!-- These are the services that the gateway will serve. 
+			Any other requests will receive a HTT_NOT_FOUND -->
+		<services>
+			<service>opensrf.math</service> 
+			<service>open-ils.cat</service> 
+			<service>open-ils.search</service> 
+			<service>open-ils.circ</service> 
+			<service>open-ils.actor</service> 
+			<service>open-ils.auth</service> 
+		</services>
+
+
 		<!-- jabber login info -->
 		<username>mylogin</username>
 		<passwd>mypassword</passwd>
diff --git a/src/gateway/osrf_json_gateway.c b/src/gateway/osrf_json_gateway.c
index 578238a..440c1ae 100644
--- a/src/gateway/osrf_json_gateway.c
+++ b/src/gateway/osrf_json_gateway.c
@@ -1,6 +1,7 @@
 #include "apachetools.h"
 #include "opensrf/osrf_app_session.h"
 #include "opensrf/osrf_system.h"
+#include "opensrf/osrfConfig.h"
 #include "objson/object.h"
 #include "objson/json2xml.h"
 #include <sys/time.h>
@@ -24,6 +25,7 @@ module AP_MODULE_DECLARE_DATA osrf_json_gateway_module;
 char* osrf_json_gateway_config_file = NULL;
 int bootstrapped = 0;
 int numserved = 0;
+osrfStringArray* allowedServices = NULL;
 
 static const char* osrf_json_gateway_set_config(cmd_parms *parms, void *config, const char *arg) {
 	osrf_json_gateway_config  *cfg;
@@ -52,16 +54,25 @@ static void* osrf_json_gateway_create_config( apr_pool_t* p, server_rec* s) {
 static void osrf_json_gateway_child_init(apr_pool_t *p, server_rec *s) {
 
 	char* cfg = osrf_json_gateway_config_file;
-	if( ! osrf_system_bootstrap_client( cfg, CONFIG_CONTEXT) ) {
+	if( ! osrf_system_bootstrap_client( cfg, CONFIG_CONTEXT ) ) {
 		ap_log_error( APLOG_MARK, APLOG_ERR, 0, s, 
 			"Unable to Bootstrap OpenSRF Client with config %s..", cfg);
 		return;
 	}
+
 	bootstrapped = 1;
+	allowedServices = osrfNewStringArray(8);
 	osrfLogInfo(OSRF_LOG_MARK, "Bootstrapping gateway child for requests");
+	osrfConfigGetValueList( NULL, allowedServices, "/services/service" );
+
+	int i;
+	for( i = 0; i < allowedServices->size; i++ ) {
+		fprintf(stderr, "allowed service: %s\n", 
+			osrfStringArrayGetString(allowedServices, i));
+	}
 
 
-#ifdef OSRF_GATEWAY_ENABLE_RLIMIT /* emergency measures only */
+#ifdef OSRF_GATEWAY_ENABLE_RLIMIT /* emergency test measures only */
 	struct rlimit lim = { 536870912, 536870912 }; /* 512MB */
 	setrlimit(RLIMIT_AS, &lim);
 	setrlimit(RLIMIT_MEMLOCK,&lim);
@@ -120,8 +131,16 @@ static int osrf_json_gateway_method_handler (request_rec *r) {
 		ap_set_content_type(r, "text/plain");
 	}
 
+	int ret = OK;
+
+	if(!(service && method) || 
+		!osrfStringArrayContains(allowedServices, service)) {
 
-	if( service && method ) {
+		osrfLogError(OSRF_LOG_MARK, 
+			"Service [%s] not found or not allowed", service);
+		ret = HTTP_NOT_FOUND;
+
+	} else {
 
 		osrfLogInfo( OSRF_LOG_MARK,  "service=%s, method=%s", service, method );
 		osrfAppSession* session = osrf_app_client_session_init(service);
@@ -230,7 +249,7 @@ static int osrf_json_gateway_method_handler (request_rec *r) {
 
 	osrfLogDebug(OSRF_LOG_MARK, "Gateway served %d requests", ++numserved);
 
-	return OK;
+	return ret;
 }