Author: supun
Date: Mon Oct 15 02:15:29 2007
New Revision: 584715
URL: http://svn.apache.org/viewvc?rev=584715&view=rev
Log: (empty)
Modified:
webservices/rampart/scratch/c/saml/SAML.vcproj
webservices/rampart/scratch/c/saml/include/SAML.h
webservices/rampart/scratch/c/saml/include/saml_req.h
webservices/rampart/scratch/c/saml/src/assertion.c
webservices/rampart/scratch/c/saml/src/query.c
webservices/rampart/scratch/c/saml/src/request.c
Modified: webservices/rampart/scratch/c/saml/SAML.vcproj
URL:
http://svn.apache.org/viewvc/webservices/rampart/scratch/c/saml/SAML.vcproj?rev=584715&r1=584714&r2=584715&view=diff
==============================================================================
--- webservices/rampart/scratch/c/saml/SAML.vcproj (original)
+++ webservices/rampart/scratch/c/saml/SAML.vcproj Mon Oct 15 02:15:29 2007
@@ -40,7 +40,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
-
AdditionalIncludeDirectories="E:\axis2c\axis2c\util\include;E:\axis2c\axis2c\axiom\include;E:\project\SAML\include"
+
AdditionalIncludeDirectories="E:\axis2c\util\include;E:\axis2c\axiom\include;E:\project\SAML\include"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SAML_EXPORTS;AXIS2_DECLARE_EXPORT;_CRT_SECURE_NO_DEPRECATE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -63,7 +63,7 @@
Name="VCLinkerTool"
AdditionalDependencies="axutil.lib axiom.lib"
LinkIncremental="2"
-
AdditionalLibraryDirectories="E:\axis2c\axis2c\ides\vc\axis2c\deploy\lib"
+
AdditionalLibraryDirectories="E:\axis2c\build\deploy\lib"
GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="1"
@@ -202,6 +202,18 @@
>
</File>
<File
+ RelativePath=".\src\query.c"
+ >
+ </File>
+ <File
+ RelativePath=".\src\request.c"
+ >
+ </File>
+ <File
+ RelativePath=".\src\response.c"
+ >
+ </File>
+ <File
RelativePath=".\src\stmt.c"
>
</File>
@@ -217,6 +229,10 @@
>
<File
RelativePath=".\include\SAML.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\saml_req.h"
>
</File>
</Filter>
Modified: webservices/rampart/scratch/c/saml/include/SAML.h
URL:
http://svn.apache.org/viewvc/webservices/rampart/scratch/c/saml/include/SAML.h?rev=584715&r1=584714&r2=584715&view=diff
==============================================================================
--- webservices/rampart/scratch/c/saml/include/SAML.h (original)
+++ webservices/rampart/scratch/c/saml/include/SAML.h Mon Oct 15 02:15:29 2007
@@ -342,7 +342,7 @@
axutil_array_list_t *conditions;
/* An XML Signature that authenticates the assertion */
- saml_signature_t *signature;
+ axiom_node_t *signature;
axutil_array_list_t *statements;
};
@@ -411,4 +411,14 @@
AXIS2_EXTERN void AXIS2_CALL saml_action_free(saml_action_t *action,
axutil_env_t *env);
AXIS2_EXTERN int AXIS2_CALL saml_action_build(saml_action_t *action,
axiom_node_t *node, axutil_env_t *env);
AXIS2_EXTERN axiom_node_t * AXIS2_CALL saml_action_to_om(saml_action_t
*action, axiom_node_t *parent, axutil_env_t *env);
+
+AXIS2_EXTERN saml_evidence_t * AXIS2_CALL saml_evidence_create(axutil_env_t
*env);
+AXIS2_EXTERN void AXIS2_CALL saml_evidence_free(saml_evidence_t *evidence,
axutil_env_t *env);
+AXIS2_EXTERN int AXIS2_CALL saml_evidence_build(saml_evidence_t *evidence,
axiom_node_t *node, axutil_env_t *env);
+AXIS2_EXTERN axiom_node_t * AXIS2_CALL saml_evidence_to_om(saml_evidence_t
*evidence, axiom_node_t *parent, axutil_env_t *env);
+
+AXIS2_EXTERN int AXIS2_CALL saml_attr_desig_init(saml_attr_desig_t
*attr_desig, axutil_env_t *env);
+AXIS2_EXTERN int AXIS2_CALL saml_attr_desig_uninit(saml_attr_desig_t
*attr_desig, axutil_env_t *env);
+AXIS2_EXTERN int AXIS2_CALL saml_attr_desig_build(saml_attr_desig_t
*attr_desig, axiom_node_t *node, axutil_env_t *env);
+AXIS2_EXTERN axiom_node_t * AXIS2_CALL saml_attr_desig_to_om(saml_attr_desig_t
*attr_desig, axiom_node_t *parent, axutil_env_t *env);
#endif
Modified: webservices/rampart/scratch/c/saml/include/saml_req.h
URL:
http://svn.apache.org/viewvc/webservices/rampart/scratch/c/saml/include/saml_req.h?rev=584715&r1=584714&r2=584715&view=diff
==============================================================================
--- webservices/rampart/scratch/c/saml/include/saml_req.h (original)
+++ webservices/rampart/scratch/c/saml/include/saml_req.h Mon Oct 15 02:15:29
2007
@@ -212,7 +212,7 @@
AXIS2_EXTERN saml_subject_query_t* AXIS2_CALL
saml_subject_query_create(axutil_env_t *env);
AXIS2_EXTERN int AXIS2_CALL saml_subject_query_init(saml_subject_query_t*
subject_query, axutil_env_t *env);
AXIS2_EXTERN int AXIS2_CALL saml_subject_query_build(saml_subject_query_t*
subject_query, axiom_node_t *node, axutil_env_t *env);
-AXIS2_EXTERN int AXIS2_CALL saml_subject_query_uninit(axutil_env_t *env);
+AXIS2_EXTERN int AXIS2_CALL saml_subject_query_uninit(saml_subject_query_t*
subject_query, axutil_env_t *env);
AXIS2_EXTERN axiom_node_t* AXIS2_CALL
saml_subject_query_to_om(saml_subject_query_t *subject_query,
axiom_node_t *parent,
axutil_env_t *env);
@@ -221,7 +221,7 @@
AXIS2_EXTERN saml_authentication_query_t* AXIS2_CALL
saml_authentication_query_create(axutil_env_t *env);
AXIS2_EXTERN int AXIS2_CALL
saml_authentication_query_init(saml_authentication_query_t
*authentication_query, axutil_env_t *env);
AXIS2_EXTERN int AXIS2_CALL
saml_authentication_query_build(saml_authentication_query_t*
authentication_query, axiom_node_t *node, axutil_env_t *env);
-AXIS2_EXTERN int AXIS2_CALL saml_authentication_query_uninit(axutil_env_t
*env);
+AXIS2_EXTERN int AXIS2_CALL
saml_authentication_query_uninit(saml_authentication_query_t*, axutil_env_t
*env);
AXIS2_EXTERN axiom_node_t* AXIS2_CALL
saml_authentication_query_to_om(saml_authentication_query_t
*authentication_query,
axiom_node_t *parent,
axutil_env_t *env);
@@ -236,7 +236,7 @@
AXIS2_EXTERN saml_attr_query_t* AXIS2_CALL saml_attr_query_create(axutil_env_t
*env);
AXIS2_EXTERN int AXIS2_CALL saml_attr_query_init(saml_attr_query_t*
attribute_query, axutil_env_t *env);
AXIS2_EXTERN int AXIS2_CALL saml_attr_query_build(saml_attr_query_t*
attribute_query, axiom_node_t *node, axutil_env_t *env);
-AXIS2_EXTERN int AXIS2_CALL saml_attr_query_uninit(axutil_env_t *env);
+AXIS2_EXTERN int AXIS2_CALL saml_attr_query_uninit(saml_attr_query_t*
attribute_query, axutil_env_t *env);
AXIS2_EXTERN axiom_node_t* AXIS2_CALL saml_attr_query_to_om(saml_attr_query_t
*attribute_query,
axiom_node_t *parent,
axutil_env_t *env);
@@ -258,7 +258,7 @@
AXIS2_EXTERN saml_autho_decision_query_t* AXIS2_CALL
saml_autho_decision_query_create(axutil_env_t *env);
AXIS2_EXTERN int AXIS2_CALL
saml_autho_decision_query_init(saml_autho_decision_query_t*
autho_decision_query, axutil_env_t *env);
AXIS2_EXTERN int AXIS2_CALL
saml_autho_decision_query_build(saml_autho_decision_query_t*
autho_decision_query, axiom_node_t *node, axutil_env_t *env);
-AXIS2_EXTERN int AXIS2_CALL saml_autho_decision_query_uninit(axutil_env_t
*env);
+AXIS2_EXTERN int AXIS2_CALL
saml_autho_decision_query_uninit(saml_autho_decision_query_t*
autho_decision_query, axutil_env_t *env);
AXIS2_EXTERN axiom_node_t* AXIS2_CALL
saml_autho_decision_query_to_om(saml_autho_decision_query_t
*autho_decision_query,
axiom_node_t *parent,
axutil_env_t *env);
Modified: webservices/rampart/scratch/c/saml/src/assertion.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/scratch/c/saml/src/assertion.c?rev=584715&r1=584714&r2=584715&view=diff
==============================================================================
--- webservices/rampart/scratch/c/saml/src/assertion.c (original)
+++ webservices/rampart/scratch/c/saml/src/assertion.c Mon Oct 15 02:15:29 2007
@@ -179,11 +179,11 @@
}
else if (axutil_strcmp(axiom_element_get_localname(ce,
env), SAML_ADVICE))
{
-
+
}
else if (axutil_strcmp(axiom_element_get_localname(ce,
env), SAML_SIGNATURE))
{
-
+ assertion->signature = cn;
}
else
{
@@ -282,7 +282,7 @@
}
if (assertion->signature)
{
-
+
}
}
return n;
Modified: webservices/rampart/scratch/c/saml/src/query.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/scratch/c/saml/src/query.c?rev=584715&r1=584714&r2=584715&view=diff
==============================================================================
--- webservices/rampart/scratch/c/saml/src/query.c (original)
+++ webservices/rampart/scratch/c/saml/src/query.c Mon Oct 15 02:15:29 2007
@@ -23,6 +23,16 @@
subject_query->subject = NULL;
return AXIS2_SUCCESS;
}
+AXIS2_EXTERN int AXIS2_CALL saml_subject_query_uninit(saml_subject_query_t
*subject_query, axutil_env_t *env)
+{
+ if(subject_query->subject)
+ {
+ saml_subject_uninit(subject_query->subject, env);
+ AXIS2_FREE(env->allocator, subject_query->subject);
+ return AXIS2_SUCCESS;
+ }
+ return AXIS2_FAILURE;
+}
AXIS2_EXTERN saml_authentication_query_t* AXIS2_CALL
saml_authentication_query_create(axutil_env_t *env)
@@ -50,6 +60,20 @@
authentication_query->subject = NULL;
return AXIS2_SUCCESS;
}
+AXIS2_EXTERN int AXIS2_CALL
saml_authentication_query_uninit(saml_authentication_query_t
*authentication_query,
+
axutil_env_t
*env)
+{
+ if(authentication_query->subject)
+ {
+ saml_subject_uninit(authentication_query->subject, env);
+ AXIS2_FREE(env->allocator, authentication_query->subject);
+ }
+ if(authentication_query->auth_method)
+ {
+ AXIS2_FREE(env->allocator, authentication_query->auth_method);
+ }
+ return AXIS2_SUCCESS;
+}
AXIS2_EXTERN saml_attr_query_t* AXIS2_CALL saml_attr_query_create(axutil_env_t
*env)
@@ -79,6 +103,26 @@
return AXIS2_SUCCESS;
}
+AXIS2_EXTERN int AXIS2_CALL saml_attr_query_uninit(saml_attr_query_t*
attribute_query,
+
axutil_env_t *env)
+{
+ int i = 0, size = 0;
+ if(attribute_query->resource)
+ {
+ AXIS2_FREE(env->allocator, attribute_query->resource);
+ }
+ if(attribute_query->attr_desigs)
+ {
+ axutil_array_list_free(attribute_query->attr_desigs, env);
+ }
+ if (attribute_query->subject)
+ {
+ saml_subject_uninit(attribute_query->subject, env);
+ AXIS2_FREE(env->allocator, attribute_query->subject);
+ }
+ return AXIS2_SUCCESS;
+}
+
AXIS2_EXTERN saml_autho_decision_query_t* AXIS2_CALL
saml_autho_decision_query_create(axutil_env_t *env)
{
saml_autho_decision_query_t *autho_decision_query = NULL;
@@ -110,6 +154,40 @@
autho_decision_query->subject = NULL;
return AXIS2_SUCCESS;
}
+AXIS2_EXTERN int AXIS2_CALL
saml_autho_decision_query_uninit(saml_autho_decision_query_t*
autho_decision_query,
+
axutil_env_t *env)
+{
+ int size =0, i =0;
+ saml_action_t *action = NULL;
+
+ if(autho_decision_query->evidence)
+ {
+ saml_evidence_free(autho_decision_query->evidence, env);
+ }
+ if(autho_decision_query->resource)
+ {
+ AXIS2_FREE(env->allocator, autho_decision_query->resource);
+ }
+ if(autho_decision_query->subject)
+ {
+ saml_subject_uninit(autho_decision_query->subject, env);
+ AXIS2_FREE(env->allocator, autho_decision_query->subject);
+ }
+ if(autho_decision_query->saml_actions)
+ {
+ size =
axutil_array_list_size(autho_decision_query->saml_actions, env);
+
+ for(i = 0; i < size; i++)
+ {
+ action =
(saml_action_t*)axutil_array_list_get(autho_decision_query->saml_actions, env,
i);
+ if(action)
+ saml_action_free(action, env);
+ }
+
+ axutil_array_list_free(autho_decision_query->saml_actions, env);
+ }
+ return AXIS2_SUCCESS;
+}
AXIS2_EXTERN int AXIS2_CALL saml_subject_query_build(saml_subject_query_t*
subject_query,
@@ -343,8 +421,7 @@
{
if(autho_decision_query->saml_actions)
{
- action =
(saml_action_t*)AXIS2_MALLOC(env->allocator, sizeof(saml_action_t));
- saml_action_init(action, env);
+ action = saml_action_create(env);
saml_action_build(action, child_node,
env);
axutil_array_list_add(autho_decision_query->saml_actions, env, action);
}
@@ -627,7 +704,7 @@
{
if(query->query)
{
- saml_subject_query_uninit(env);
+ saml_subject_query_uninit(query->query, env);
AXIS2_FREE(env->allocator, query->query);
}
}
@@ -635,7 +712,7 @@
{
if(query->query)
{
- saml_authentication_query_uninit(env);
+ saml_authentication_query_uninit(query->query,
env);
AXIS2_FREE(env->allocator, query->query);
}
}
@@ -643,7 +720,7 @@
{
if(query->query)
{
- saml_attr_query_uninit(env);
+ saml_attr_query_uninit(query->query, env);
AXIS2_FREE(env->allocator, query->query);
}
}
@@ -651,7 +728,7 @@
{
if(query->query)
{
- saml_autho_decision_query_uninit(env);
+ saml_autho_decision_query_uninit(query->query,
env);
AXIS2_FREE(env->allocator, query->query);
}
}
@@ -831,8 +908,7 @@
act = axutil_array_list_remove(autho_dec_query->saml_actions,
env, index);
if(act)
{
- saml_action_uninit(act, env);
- AXIS2_FREE(env->allocator, act);
+ saml_action_free(act, env);
return AXIS2_SUCCESS;
}
}
Modified: webservices/rampart/scratch/c/saml/src/request.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/scratch/c/saml/src/request.c?rev=584715&r1=584714&r2=584715&view=diff
==============================================================================
--- webservices/rampart/scratch/c/saml/src/request.c (original)
+++ webservices/rampart/scratch/c/saml/src/request.c Mon Oct 15 02:15:29 2007
@@ -166,8 +166,7 @@
element_local_name =
axiom_element_get_localname(element, env);
if(element != NULL &&
!(axutil_strcmp(element_local_name, SAML_RESPOND_WITH)))
- {
-
+ {
axutil_array_list_add(request->saml_responds,
env,
axiom_element_get_qname(element, env,
child_node));
