Export error environment variables.

[mod_auth_kerb.git] / gss.h

diff --git a/gss.h b/gss.h
index 6fde4b8..611f68f 100644 (file)
--- a/gss.h
+++ b/gss.h
@@ -29,6 +29,11 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+/*
+ * Most of the name attributes management code is based from
+ * https://github.com/modauthgssapi/mod_auth_gssapi, written by Simo Sorce.
+ */
+
 #ifndef __GSS_H__
 #define __GSS_H__
 
@@ -43,33 +48,91 @@
 #include <apr_strings.h>
 
 #include <gssapi.h>
+#include <gssapi/gssapi.h>
+#include <gssapi/gssapi_ext.h>
+
 
 #define SERVICE_NAME "HTTP"
 
+typedef struct  {
+    char *env_name;
+    char *attr_name;
+} mag_na_map;
+
+typedef struct  {
+    char output_json;
+    int map_count;
+    mag_na_map map[];
+} mag_name_attributes;
+
+typedef struct {
+   const char *name;
+    const char *value;
+} mag_attr;
+
+typedef struct  {
+    gss_buffer_desc name;
+    int authenticated;
+    int complete;
+    gss_buffer_desc value;
+    gss_buffer_desc display_value;
+    const char *env_name;
+    int number;
+    int more;
+} name_attr;
+
 typedef struct {
     const char *service_name;
     const char *krb5_keytab;
+    apr_pool_t *pool;
+    mag_name_attributes *name_attributes;
 } gss_auth_config;
 
-typedef struct gss_conn_ctx_t {
-    gss_ctx_id_t context;
-    enum {
-       GSS_CTX_EMPTY,
-       GSS_CTX_IN_PROGRESS,
-       GSS_CTX_ESTABLISHED,
-    } state;
-    char *user;
-} *gss_conn_ctx;
+typedef struct {
+  gss_ctx_id_t context;
+  gss_cred_id_t server_creds;
+  enum {
+    GSS_CTX_EMPTY,
+    GSS_CTX_IN_PROGRESS,
+    GSS_CTX_FAILED,
+    GSS_CTX_ESTABLISHED,
+  } state;
+  enum {
+    GSS_FILT_NEW,
+    GSS_FILT_INPROGRESS,
+    GSS_FILT_ERROR,
+  } filter_stat;
+
+  char *user;
+  gss_buffer_desc output_token;
+  unsigned int nonce;
+  apr_pool_t *pool;
+  int na_count;
+  mag_attr *name_attributes;
+} gss_conn_ctx_t, *gss_conn_ctx;
+
+
+
 
 void
-gss_log(const char *file, int line, int level, int status,
-        const request_rec *r, const char *fmt, ...);
+gss_log(const char *file,
+        int line,
+#if AP_SERVER_MAJORVERSION_NUMBER == 2 && AP_SERVER_MINORVERSION_NUMBER == 4
+        int module_index,
+#endif
+        int level,
+        int status,
+        const request_rec *r,
+        const char *fmt, ...);
 
 apr_status_t
-cleanup_conn_ctx(void *data);
+gss_cleanup_conn_ctx(void *data);
 
 gss_conn_ctx
-gss_get_conn_ctx(request_rec *r);
+gss_retrieve_conn_ctx(request_rec *r);
+
+gss_conn_ctx
+gss_create_conn_ctx(request_rec *r, gss_auth_config *conf);
 
 void *
 gss_config_dir_create(apr_pool_t *p, char *d);
@@ -83,4 +146,7 @@ get_gss_creds(request_rec *r, gss_auth_config *conf, gss_cred_id_t *server_creds
 int
 cmp_gss_type(gss_buffer_t token, gss_OID oid);
 
+const char *
+mag_name_attrs(cmd_parms *parms, void *mconfig, const char *w);
+
 #endif