From: Jennifer Richards Date: Thu, 24 May 2018 15:43:31 +0000 (-0400) Subject: Move AAA server methods out of tr_idp.[ch] into their own files X-Git-Tag: 3.4.0~1^2~18^2~17 X-Git-Url: http://www.project-moonshot.org/gitweb/?p=trust_router.git;a=commitdiff_plain;h=63c68b472c64d36c2084b7c430f3f2284338941b Move AAA server methods out of tr_idp.[ch] into their own files * Create tr_aaa_server.[ch], move methods out of tr_idp.[ch] - Existing methods unchanged * Add port to TR_AAA_SERVER * Add get/set methods for hostname/port * Update makefiles --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 2aa60bc..52ee9d6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -96,7 +96,7 @@ set(SOURCE_FILES trp/trp_upd.c trp/trpc.c trp/trps.c include/tr_name_internal.h mon/mon_req.c mon/mon_req_encode.c mon/mon_req_decode.c - mon/mon_resp.c mon/mon_common.c mon/mon_resp_encode.c mon/mon_resp_decode.c tr/tr_mon.c mon/mons.c include/tr_socket.h common/tr_gss.c include/tr_gss.h common/tr_config_internal.c mon/mons_handlers.c include/mons_handlers.h tr/tr_tid_mons.c tr/tr_tid_mons.c trp/trp_route.c include/trp_route.h trp/trp_rtable_encoders.c trp/trp_route_encoders.c trp/trp_peer.c include/trp_peer.h trp/trp_peer_encoders.c trp/trp_ptable_encoders.c common/tr_idp_encoders.c common/tr_comm_encoders.c common/tr_rp_client.c include/tr_rp_client.h common/tr_rp_client_encoders.c common/tr_filter_encoders.c common/tr_config_encoders.c common/tr_config_filters.c common/tr_config_realms.c common/tr_config_rp_clients.c common/tr_config_orgs.c common/tr_config_comms.c common/tr_list.c include/tr_list.h include/tr_constraint_internal.h include/tr_json_util.h) + mon/mon_resp.c mon/mon_common.c mon/mon_resp_encode.c mon/mon_resp_decode.c tr/tr_mon.c mon/mons.c include/tr_socket.h common/tr_gss.c include/tr_gss.h common/tr_config_internal.c mon/mons_handlers.c include/mons_handlers.h tr/tr_tid_mons.c tr/tr_tid_mons.c trp/trp_route.c include/trp_route.h trp/trp_rtable_encoders.c trp/trp_route_encoders.c trp/trp_peer.c include/trp_peer.h trp/trp_peer_encoders.c trp/trp_ptable_encoders.c common/tr_idp_encoders.c common/tr_comm_encoders.c common/tr_rp_client.c include/tr_rp_client.h common/tr_rp_client_encoders.c common/tr_filter_encoders.c common/tr_config_encoders.c common/tr_config_filters.c common/tr_config_realms.c common/tr_config_rp_clients.c common/tr_config_orgs.c common/tr_config_comms.c common/tr_list.c include/tr_list.h include/tr_constraint_internal.h include/tr_json_util.h common/tr_aaa_server.c include/tr_aaa_server.h) # Does not actually build! add_executable(trust_router ${SOURCE_FILES}) diff --git a/Makefile.am b/Makefile.am index 291f889..4a05c9f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -22,6 +22,7 @@ common_srcs = common/tr_name.c \ common/tr_rp_client.c \ common/tr_rp_client_encoders.c \ common/tr_idp.c \ + common/tr_aaa_server.c \ common/tr_idp_encoders.c \ common/tr_filter.c \ common/tr_filter_encoders.c \ @@ -278,6 +279,7 @@ noinst_HEADERS = include/gsscon.h \ include/tr.h \ include/tr_msg.h \ include/tr_idp.h \ + include/tr_aaa_server.h \ include/tr_rp.h include/tr_rp_client.h \ include/tr_comm.h \ include/tr_apc.h \ diff --git a/common/tr_aaa_server.c b/common/tr_aaa_server.c new file mode 100644 index 0000000..e8df13d --- /dev/null +++ b/common/tr_aaa_server.c @@ -0,0 +1,140 @@ +/* + * Copyright (c) 2012-2018, JANET(UK) + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * 3. Neither the name of JANET(UK) nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + * + */ + + +#include + +#include +#include +#include + +static int tr_aaa_server_destructor(void *obj) +{ + TR_AAA_SERVER *aaa=talloc_get_type_abort(obj, TR_AAA_SERVER); + if (aaa->hostname!=NULL) + tr_free_name(aaa->hostname); + return 0; +} + +TR_AAA_SERVER *tr_aaa_server_new(TALLOC_CTX *mem_ctx, TR_NAME *hostname) +{ + TR_AAA_SERVER *aaa=talloc(mem_ctx, TR_AAA_SERVER); + if (aaa!=NULL) { + aaa->next=NULL; + aaa->hostname=hostname; + talloc_set_destructor((void *)aaa, tr_aaa_server_destructor); + } + return aaa; +} + +void tr_aaa_server_free(TR_AAA_SERVER *aaa) +{ + talloc_free(aaa); +} + +TR_AAA_SERVER_ITER *tr_aaa_server_iter_new(TALLOC_CTX *mem_ctx) +{ + return talloc(mem_ctx, TR_AAA_SERVER_ITER); +} + +void tr_aaa_server_iter_free(TR_AAA_SERVER_ITER *iter) +{ + talloc_free(iter); +} + +TR_AAA_SERVER *tr_aaa_server_iter_first(TR_AAA_SERVER_ITER *iter, TR_AAA_SERVER *aaa) +{ + iter->this=aaa; + return iter->this; +} + +TR_AAA_SERVER *tr_aaa_server_iter_next(TR_AAA_SERVER_ITER *iter) +{ + if (iter->this!=NULL) { + iter->this=iter->this->next; + } + return iter->this; +} + +TR_NAME *tr_aaa_server_get_hostname(TR_AAA_SERVER *aaa) +{ + return aaa->hostname; +} + +/** + * Set the hostname for a AAA server + * + * Takes ownership of the TR_NAME. Does nothing if aaa is null. + * + * @param aaa + * @param hostname + */ +void tr_aaa_server_set_hostname(TR_AAA_SERVER *aaa, TR_NAME *hostname) +{ + if (aaa == NULL) + return; + + if (aaa->hostname != NULL) { + tr_free_name(aaa->hostname); + } + + aaa->hostname = hostname; +} + +int tr_aaa_server_get_port(TR_AAA_SERVER *aaa) +{ + return aaa->port; +} + +/** + * Set the port for a AAA server + * + * If port is outside the range 1-65535, uses the standard TID port (12309). + * Does nothing if aaa is null. + * + * @param aaa + * @param port + */ +void tr_aaa_server_set_port(TR_AAA_SERVER *aaa, int port) +{ + if (aaa == NULL) + return; + + if ((port <= 0) || (port > 65535)) + port = TID_PORT; + + aaa->port = port; +} + + diff --git a/common/tr_idp.c b/common/tr_idp.c index 50a9330..a3d84a7 100644 --- a/common/tr_idp.c +++ b/common/tr_idp.c @@ -35,60 +35,12 @@ #include #include +#include #include #include #include #include -static int tr_aaa_server_destructor(void *obj) -{ - TR_AAA_SERVER *aaa=talloc_get_type_abort(obj, TR_AAA_SERVER); - if (aaa->hostname!=NULL) - tr_free_name(aaa->hostname); - return 0; -} - -TR_AAA_SERVER *tr_aaa_server_new(TALLOC_CTX *mem_ctx, TR_NAME *hostname) -{ - TR_AAA_SERVER *aaa=talloc(mem_ctx, TR_AAA_SERVER); - if (aaa!=NULL) { - aaa->next=NULL; - aaa->hostname=hostname; - talloc_set_destructor((void *)aaa, tr_aaa_server_destructor); - } - return aaa; -} - -void tr_aaa_server_free(TR_AAA_SERVER *aaa) -{ - talloc_free(aaa); -} - -TR_AAA_SERVER_ITER *tr_aaa_server_iter_new(TALLOC_CTX *mem_ctx) -{ - return talloc(mem_ctx, TR_AAA_SERVER_ITER); -} - -void tr_aaa_server_iter_free(TR_AAA_SERVER_ITER *iter) -{ - talloc_free(iter); -} - -TR_AAA_SERVER *tr_aaa_server_iter_first(TR_AAA_SERVER_ITER *iter, TR_AAA_SERVER *aaa) -{ - iter->this=aaa; - return iter->this; -} - -TR_AAA_SERVER *tr_aaa_server_iter_next(TR_AAA_SERVER_ITER *iter) -{ - if (iter->this!=NULL) { - iter->this=iter->this->next; - } - return iter->this; -} - - /* fills in shared if pointer not null */ TR_AAA_SERVER *tr_idp_aaa_server_lookup(TR_IDP_REALM *idp_realms, TR_NAME *idp_realm_name, TR_NAME *comm, int *shared_out) { diff --git a/include/tr_aaa_server.h b/include/tr_aaa_server.h new file mode 100644 index 0000000..dfe356d --- /dev/null +++ b/include/tr_aaa_server.h @@ -0,0 +1,65 @@ +/* + * Copyright (c) 2012-2018, JANET(UK) + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * 3. Neither the name of JANET(UK) nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + * + */ + +#ifndef TRUST_ROUTER_TR_AAA_SERVER_H +#define TRUST_ROUTER_TR_AAA_SERVER_H + +#include + +#include + +typedef struct tr_aaa_server { + struct tr_aaa_server *next; + TR_NAME *hostname; + int port; +} TR_AAA_SERVER; + +typedef struct tr_aaa_server_iter { + TR_AAA_SERVER *this; +} TR_AAA_SERVER_ITER; + +TR_AAA_SERVER *tr_aaa_server_new(TALLOC_CTX *mem_ctx, TR_NAME *hostname); +void tr_aaa_server_free(TR_AAA_SERVER *aaa); + +TR_NAME *tr_aaa_server_get_hostname(TR_AAA_SERVER *aaa); +void tr_aaa_server_set_hostname(TR_AAA_SERVER *aaa, TR_NAME *hostname); +int tr_aaa_server_get_port(TR_AAA_SERVER *aaa); +void tr_aaa_server_set_port(TR_AAA_SERVER *aaa, int port); + +TR_AAA_SERVER_ITER *tr_aaa_server_iter_new(TALLOC_CTX *mem_ctx); +void tr_aaa_server_iter_free(TR_AAA_SERVER_ITER *iter); +TR_AAA_SERVER *tr_aaa_server_iter_first(TR_AAA_SERVER_ITER *iter, TR_AAA_SERVER *aaa); +TR_AAA_SERVER *tr_aaa_server_iter_next(TR_AAA_SERVER_ITER *iter); + +#endif //TRUST_ROUTER_TR_AAA_SERVER_H diff --git a/include/tr_idp.h b/include/tr_idp.h index 68d669e..8b56c37 100644 --- a/include/tr_idp.h +++ b/include/tr_idp.h @@ -39,17 +39,9 @@ #include #include +#include #include -typedef struct tr_aaa_server { - struct tr_aaa_server *next; - TR_NAME *hostname; -} TR_AAA_SERVER; - -typedef struct tr_aaa_server_iter { - TR_AAA_SERVER *this; -} TR_AAA_SERVER_ITER; - /* may also want to use in tr_rp.h */ typedef enum tr_realm_origin { TR_REALM_LOCAL=0, /* realm we were configured to contact */ @@ -86,16 +78,8 @@ TR_IDP_REALM *tr_idp_realm_sweep_func(TR_IDP_REALM *head); int tr_idp_realm_aaa_server_count(TR_IDP_REALM *idp); int tr_idp_realm_apc_count(TR_IDP_REALM *idp); void tr_idp_realm_incref(TR_IDP_REALM *realm); -void tr_idp_realm_decref(TR_IDP_REALM *realm); - -TR_AAA_SERVER *tr_aaa_server_new(TALLOC_CTX *mem_ctx, TR_NAME *hostname); -void tr_aaa_server_free(TR_AAA_SERVER *aaa); - -TR_AAA_SERVER_ITER *tr_aaa_server_iter_new(TALLOC_CTX *mem_ctx); -void tr_aaa_server_iter_free(TR_AAA_SERVER_ITER *iter); -TR_AAA_SERVER *tr_aaa_server_iter_first(TR_AAA_SERVER_ITER *iter, TR_AAA_SERVER *aaa); -TR_AAA_SERVER *tr_aaa_server_iter_next(TR_AAA_SERVER_ITER *iter); +void tr_idp_realm_decref(TR_IDP_REALM *realm); TR_AAA_SERVER *tr_idp_aaa_server_lookup(TR_IDP_REALM *idp_realms, TR_NAME *idp_realm_name, TR_NAME *comm, int *shared_out); TR_AAA_SERVER *tr_default_server_lookup(TR_AAA_SERVER *default_servers, TR_NAME *comm);