diff --git a/CASA-auth-token/server/ApacheSupport/2.2/linux/Makefile.am b/CASA-auth-token/server/ApacheSupport/2.2/linux/Makefile.am index 04bcce2e..63cd4335 100644 --- a/CASA-auth-token/server/ApacheSupport/2.2/linux/Makefile.am +++ b/CASA-auth-token/server/ApacheSupport/2.2/linux/Makefile.am @@ -33,7 +33,7 @@ SUBDIRS = DIST_SUBDIRS = -ROOT = ../../../.. +ROOT = ../../.. LIBDIR = $(ROOT)/$(LIB) APACHEINCLUDE = /usr/include/apache2 diff --git a/CASA-auth-token/server/AuthTokenValidate/Svc/linux/Makefile.am b/CASA-auth-token/server/AuthTokenValidate/Svc/linux/Makefile.am index c0328f44..aa8bd9dc 100644 --- a/CASA-auth-token/server/AuthTokenValidate/Svc/linux/Makefile.am +++ b/CASA-auth-token/server/AuthTokenValidate/Svc/linux/Makefile.am @@ -36,7 +36,7 @@ SUBDIRS = DIST_SUBDIRS = -ROOT = ../../../.. +ROOT = ../../.. LIBDIR = $(ROOT)/$(LIB) BINDIR = $(ROOT)/$(BIN) diff --git a/CASA-auth-token/server/AuthTokenValidate/idenTokenProviders/casa/linux/Makefile.am b/CASA-auth-token/server/AuthTokenValidate/idenTokenProviders/casa/linux/Makefile.am index 1124f371..3b1d39c1 100644 --- a/CASA-auth-token/server/AuthTokenValidate/idenTokenProviders/casa/linux/Makefile.am +++ b/CASA-auth-token/server/AuthTokenValidate/idenTokenProviders/casa/linux/Makefile.am @@ -33,9 +33,7 @@ SUBDIRS = DIST_SUBDIRS = -ROOT = ../../../../.. - -CASAINCLUDE = ../../../../../../CASA/include +ROOT = ../../../.. LIBDIR = $(ROOT)/$(LIB) @@ -54,7 +52,7 @@ CFILES = ../identokenprovider.c \ platform.c CSFILES_CSC := -INCLUDES = -I. -I.. -I../../.. -I$(CASAINCLUDE) -I../../../../../include +INCLUDES = -I. -I.. -I../../.. -I$(ROOT)/include RESOURCES = DEST_CONF_FILE_NAME = CasaIdentityToken.conf diff --git a/CASA-auth-token/server/AuthTokenValidate/linux/Makefile.am b/CASA-auth-token/server/AuthTokenValidate/linux/Makefile.am index 7a4f57ed..86c4a245 100644 --- a/CASA-auth-token/server/AuthTokenValidate/linux/Makefile.am +++ b/CASA-auth-token/server/AuthTokenValidate/linux/Makefile.am @@ -33,8 +33,7 @@ SUBDIRS = DIST_SUBDIRS = -ROOT = ../../.. -CASAINCLUDE = ../../../../CASA/include +ROOT = ../.. LIBDIR = $(ROOT)/$(LIB) @@ -55,7 +54,7 @@ CFILES = ../config.c \ platform.c CSFILES_CSC := -INCLUDES = -I. -I.. -I$(CASAINCLUDE) -I../../../include +INCLUDES = -I. -I.. -I$(ROOT)/include RESOURCES = if LIB64 diff --git a/CASA-auth-token/server/PamSupport/linux/Makefile.am b/CASA-auth-token/server/PamSupport/linux/Makefile.am index 3d16b58a..7d3eda01 100644 --- a/CASA-auth-token/server/PamSupport/linux/Makefile.am +++ b/CASA-auth-token/server/PamSupport/linux/Makefile.am @@ -35,9 +35,7 @@ SUBDIRS = DIST_SUBDIRS = -ROOT = ../../.. - -CASAINCLUDE = ../../../../CASA/include +ROOT = ../.. LIBDIR = $(ROOT)/$(LIB) @@ -53,7 +51,7 @@ MODULE_EXT = so CFILES = ../pam_authtoken.c CSFILES_CSC := -INCLUDES = -I. -I$(CASAINCLUDE) -I../../../include +INCLUDES = -I. -I$(ROOT)/include RESOURCES = CFLAGS += $(INCLUDES) $(DEFINES) diff --git a/CASA-auth-token/server/include/proto.h b/CASA-auth-token/server/include/proto.h new file mode 100644 index 00000000..87b90eb1 --- /dev/null +++ b/CASA-auth-token/server/include/proto.h @@ -0,0 +1,70 @@ +/*********************************************************************** + * + * Copyright (C) 2006 Novell, Inc. All Rights Reserved. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, + * you may find current contact information at www.novell.com. + * + * Author: Juan Carlos Luciani + * + ***********************************************************************/ + +#ifndef _PROTO_H_ +#define _PROTO_H_ + +//===[ Include files ]===================================================== + + +//===[ Type definitions ]================================================== + +// +// XML Constants for the documents exchanged between the CASA Client +// and the CASA Server. +// +#define XML_DECLARATION "" +#define AUTH_REQUEST_ELEMENT_NAME "auth_req" +#define AUTH_RESPONSE_ELEMENT_NAME "auth_resp" +#define GET_AUTH_POLICY_REQUEST_ELEMENT_NAME "get_auth_policy_req" +#define GET_AUTH_POLICY_RESPONSE_ELEMENT_NAME "get_auth_policy_resp" +#define GET_AUTH_TOKEN_REQUEST_ELEMENT_NAME "get_auth_tok_req" +#define GET_AUTH_TOKEN_RESPONSE_ELEMENT_NAME "get_auth_tok_resp" +#define AUTH_MECH_TOKEN_ELEMENT_NAME "auth_mech_token" +#define AUTH_TOKEN_ELEMENT_NAME "auth_token" +#define AUTH_POLICY_ELEMENT_NAME "auth_policy" +#define AUTH_SOURCE_ELEMENT_NAME "auth_source" +#define STATUS_ELEMENT_NAME "status" +#define SESSION_TOKEN_ELEMENT_NAME "session_token" +#define LIFETIME_ELEMENT_NAME "lifetime" +#define DESCRIPTION_ELEMENT_NAME "description" +#define SERVICE_ELEMENT_NAME "service" +#define HOST_ELEMENT_NAME "host" +#define REALM_ELEMENT_NAME "realm" +#define MECHANISM_ELEMENT_NAME "mechanism" +#define MECHANISM_INFO_ELEMENT_NAME "mechanism_info" +#define SIGNATURE_ELEMENT_NAME "signature" +#define TYPE_ELEMENT_NAME "type" +#define IDENTITY_TOKEN_ELEMENT_NAME "ident_token" + +// +// HTTP Status Codes +// +#define HTTP_OK_STATUS_CODE "200" +#define HTTP_UNAUTHORIZED_STATUS_CODE "401" +#define HTTP_NOT_FOUND_STATUS_CODE "404" +#define HTTP_SERVER_ERROR_STATUS_CODE "500" + + +#endif // _PROTO_H_ diff --git a/CASA-auth-token/server/package/linux/CASA_auth_token_client.changes b/CASA-auth-token/server/package/linux/CASA_auth_token_client.changes deleted file mode 100644 index 8629e98d..00000000 --- a/CASA-auth-token/server/package/linux/CASA_auth_token_client.changes +++ /dev/null @@ -1,83 +0,0 @@ -------------------------------------------------------------------- -Thu Nov 9 17:16:36 MST 2006 - jluciani@novell.com - -- Finished the changes to enable client/ATS communications - over SSL. - -------------------------------------------------------------------- -Tue Nov 7 16:01:11 MST 2006 - jluciani@novell.com - -- Made changes to enable client/ats communication over SSL. (Not quite - done with this yet). - -- Updated the make system to allow Windows builds to be made from - the command line using Cygwin. - -------------------------------------------------------------------- -Thu Oct 19 09:20:24 MDT 2006 - jluciani@novell.com - -- Created client-devel RPM. - -- Made changes to conform to updates made to the Java components - with regard to the layout of files. - -------------------------------------------------------------------- -Tue Oct 10 08:46:22 MDT 2006 - jluciani@novell.com - -- Brought up to date the README and TODO files. - -------------------------------------------------------------------- -Mon Oct 9 09:28:37 MDT 2006 - jluciani@novell.com - -- Cleaned up compiler warnings that were present in some of the - components. - -------------------------------------------------------------------- -Fri Oct 6 14:22:54 MDT 2006 - schoi@novell.com - -- Add the CASA build check as dependency in spec file - -------------------------------------------------------------------- -Thu Oct 5 15:21:39 MDT 2006 - jluciani@novell.com - -- Ported the client to Linux and created the CASA_auth_token_client package. - -------------------------------------------------------------------- -Mon Oct 2 11:47:16 MDT 2006 - jluciani@novell.com - -- Made spec file modifications suggested by SuSE. The changes entailed - leveraging RPM macros instead of using my own scripts to make the - RPM more solid. - -------------------------------------------------------------------- -Thu Sep 14 17:41:40 MDT 2006 - jluciani@novell.com - -- Added rc script for Validate AuthToken Service. - -------------------------------------------------------------------- -Thu Sep 14 09:48:54 MDT 2006 - jluciani@novell.com - -- Created the Validate AuthToken Service and made all of the necessary changes - to allow it to be consumed by the AuthTokenValidate library. - -- Also made necessary spec file changes to support our configuration. - -------------------------------------------------------------------- -Tue Sep 5 08:37:35 MDT 2006 - jluciani@novell.com - -- Created client/server IPC libraries that will be utilized by libcasa_s_authtoken - to communicate with the Java Validate AuthToken Service (yet to be created) over - DOMAIN sockets. The service will utilize the libraries via JNI to be able to - process requests sent using DOMAIN sockets. - -------------------------------------------------------------------- -Tue Aug 15 10:09:32 MDT 2006 - schoi@novell.com -- Fixed CASA_auth_token_devel build requirement for CASA_auth_token_svc - -------------------------------------------------------------------- -Mon Aug 7 10:28:32 MDT 2006 - schoi@novell.com -- This file has been created for CASA_auth_token_native project for the first - time. - -------------------------------------------------------------------- - diff --git a/CASA-auth-token/server/package/linux/CASA_auth_token_server.changes b/CASA-auth-token/server/package/linux/CASA_auth_token_server.changes index 8629e98d..87539b05 100644 --- a/CASA-auth-token/server/package/linux/CASA_auth_token_server.changes +++ b/CASA-auth-token/server/package/linux/CASA_auth_token_server.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Nov 13 10:44:47 MST 2006 - jluciani@novell.com + +- Separated the non-java folder into client and server projects in + order to better support distributions that target desktops. + From now on, this changes files will only contain information + that applies to the server project. + ------------------------------------------------------------------- Thu Nov 9 17:16:36 MST 2006 - jluciani@novell.com diff --git a/CASA-auth-token/server/package/linux/CASA_auth_token_server.spec.in b/CASA-auth-token/server/package/linux/CASA_auth_token_server.spec.in index 2314fa0a..2d27a0c2 100644 --- a/CASA-auth-token/server/package/linux/CASA_auth_token_server.spec.in +++ b/CASA-auth-token/server/package/linux/CASA_auth_token_server.spec.in @@ -194,8 +194,8 @@ install -m 755 bin/%{cfg}/CasaAuthtokenValidateD %{buildroot}%{prefix}/bin/casa_ # Others install -m 644 %{_lib}/%{cfg}/CasaIdentityToken.conf %{buildroot}/etc/CASA/authtoken/modules/CasaIdentityToken.conf -install -m 755 server/AuthTokenValidate/Svc/linux/CasaAuthtokenValidateD %{buildroot}/etc/init.d/casa_atvd -install -m 750 server/AuthTokenValidate/Svc/linux/envvars %{buildroot}/etc/CASA/authtoken/validate/ +install -m 755 AuthTokenValidate/Svc/linux/CasaAuthtokenValidateD %{buildroot}/etc/init.d/casa_atvd +install -m 750 AuthTokenValidate/Svc/linux/envvars %{buildroot}/etc/CASA/authtoken/validate/ ln -sf casa_atvd %{buildroot}%{prefix}/sbin/rccasa_atvd