[serf] r2494 committed - Reduce visibility of auth related structures....

[se...@googlecode.com]

Revision: 2494
Author: chemodax
Date: Wed Apr 8 13:04:15 2015 UTC
Log: Reduce visibility of auth related structures.

* serf_private.h
(serf__auth_handler_func_t, serf__init_context_func_t,
serf__init_conn_func_t, serf__setup_request_func_t,
serf__validate_response_func_t, serf__authn_scheme_t): Move to ...

* auth/auth.h
(serf__auth_handler_func_t, serf__init_context_func_t,
serf__init_conn_func_t, serf__setup_request_func_t,
serf__validate_response_func_t, serf__authn_scheme_t): ... here.

* auth/auth_spnego_sspi.c
(): Include "auth.h"

https://code.google.com/p/serf/source/detail?r=2494

Modified:
/trunk/auth/auth.h
/trunk/auth/auth_spnego_sspi.c
/trunk/serf_private.h

=======================================
--- /trunk/auth/auth.h Fri Aug 9 17:03:57 2013 UTC
+++ /trunk/auth/auth.h Wed Apr 8 13:04:15 2015 UTC
@@ -22,6 +22,101 @@
extern "C" {
#endif

+/**
+ * For each authentication scheme we need a handler function of type
+ * serf__auth_handler_func_t. This function will be called when an
+ * authentication challenge is received in a session.
+ */
+typedef apr_status_t
+(*serf__auth_handler_func_t)(int code,
+ serf_request_t *request,
+ serf_bucket_t *response,
+ const char *auth_hdr,
+ const char *auth_attr,
+ apr_pool_t *pool);
+
+/**
+ * For each authentication scheme we need an initialization function of
type
+ * serf__init_context_func_t. This function will be called the first time
+ * serf tries a specific authentication scheme handler.
+ */
+typedef apr_status_t
+(*serf__init_context_func_t)(int code,
+ serf_context_t *conn,
+ apr_pool_t *pool);
+
+/**
+ * For each authentication scheme we need an initialization function of
type
+ * serf__init_conn_func_t. This function will be called when a new
+ * connection is opened.
+ */
+typedef apr_status_t
+(*serf__init_conn_func_t)(const serf__authn_scheme_t *scheme,
+ int code,
+ serf_connection_t *conn,
+ apr_pool_t *pool);
+
+/**
+ * For each authentication scheme we need a setup_request function of type
+ * serf__setup_request_func_t. This function will be called when a
+ * new serf_request_t object is created and should fill in the correct
+ * authentication headers (if needed).
+ */
+typedef apr_status_t
+(*serf__setup_request_func_t)(peer_t peer,
+ int code,
+ serf_connection_t *conn,
+ serf_request_t *request,
+ const char *method,
+ const char *uri,
+ serf_bucket_t *hdrs_bkt);
+
+/**
+ * This function will be called when a response is received, so that the
+ * scheme handler can validate the Authentication related response headers
+ * (if needed).
+ */
+typedef apr_status_t
+(*serf__validate_response_func_t)(const serf__authn_scheme_t *scheme,
+ peer_t peer,
+ int code,
+ serf_connection_t *conn,
+ serf_request_t *request,
+ serf_bucket_t *response,
+ apr_pool_t *pool);
+
+/**
+ * serf__authn_scheme_t: vtable for an authn scheme provider.
+ */
+struct serf__authn_scheme_t {
+ /* The name of this authentication scheme. Used in headers of requests
and
+ for logging. */
+ const char *name;
+
+ /* Key is the name of the authentication scheme in lower case, to
+ facilitate case insensitive matching of the response headers. */
+ const char *key;
+
+ /* Internal code used for this authn type. */
+ int type;
+
+ /* The context initialization function if any; otherwise, NULL */
+ serf__init_context_func_t init_ctx_func;
+
+ /* The connection initialization function if any; otherwise, NULL */
+ serf__init_conn_func_t init_conn_func;
+
+ /* The authentication handler function */
+ serf__auth_handler_func_t handle_func;
+
+ /* Function to set up the authentication header of a request */
+ serf__setup_request_func_t setup_request_func;
+
+ /* Function to validate the authentication header of a response */
+ serf__validate_response_func_t validate_response_func;
+};
+
+
void serf__encode_auth_header(const char **header, const char *protocol,
const char *data, apr_size_t data_len,
apr_pool_t *pool);
=======================================
--- /trunk/auth/auth_spnego_sspi.c Mon Sep 1 13:34:30 2014 UTC
+++ /trunk/auth/auth_spnego_sspi.c Wed Apr 8 13:04:15 2015 UTC
@@ -13,6 +13,7 @@
* limitations under the License.
*/

+#include "auth.h"
#include "auth_spnego.h"
#include "serf.h"
#include "serf_private.h"
=======================================
--- /trunk/serf_private.h Wed Apr 8 12:45:40 2015 UTC
+++ /trunk/serf_private.h Wed Apr 8 13:04:15 2015 UTC
@@ -430,100 +430,6 @@

typedef enum { PROXY, HOST } peer_t;

-/**
- * For each authentication scheme we need a handler function of type
- * serf__auth_handler_func_t. This function will be called when an
- * authentication challenge is received in a session.
- */
-typedef apr_status_t
-(*serf__auth_handler_func_t)(int code,
- serf_request_t *request,
- serf_bucket_t *response,
- const char *auth_hdr,
- const char *auth_attr,
- apr_pool_t *pool);
-
-/**
- * For each authentication scheme we need an initialization function of
type
- * serf__init_context_func_t. This function will be called the first time
- * serf tries a specific authentication scheme handler.
- */
-typedef apr_status_t
-(*serf__init_context_func_t)(int code,
- serf_context_t *conn,
- apr_pool_t *pool);
-
-/**
- * For each authentication scheme we need an initialization function of
type
- * serf__init_conn_func_t. This function will be called when a new
- * connection is opened.
- */
-typedef apr_status_t
-(*serf__init_conn_func_t)(const serf__authn_scheme_t *scheme,
- int code,
- serf_connection_t *conn,
- apr_pool_t *pool);
-
-/**
- * For each authentication scheme we need a setup_request function of type
- * serf__setup_request_func_t. This function will be called when a
- * new serf_request_t object is created and should fill in the correct
- * authentication headers (if needed).
- */
-typedef apr_status_t
-(*serf__setup_request_func_t)(peer_t peer,
- int code,
- serf_connection_t *conn,
- serf_request_t *request,
- const char *method,
- const char *uri,
- serf_bucket_t *hdrs_bkt);
-
-/**
- * This function will be called when a response is received, so that the
- * scheme handler can validate the Authentication related response headers
- * (if needed).
- */
-typedef apr_status_t
-(*serf__validate_response_func_t)(const serf__authn_scheme_t *scheme,
- peer_t peer,
- int code,
- serf_connection_t *conn,
- serf_request_t *request,
- serf_bucket_t *response,
- apr_pool_t *pool);
-
-/**
- * serf__authn_scheme_t: vtable for an authn scheme provider.
- */
-struct serf__authn_scheme_t {
- /* The name of this authentication scheme. Used in headers of requests
and
- for logging. */
- const char *name;
-
- /* Key is the name of the authentication scheme in lower case, to
- facilitate case insensitive matching of the response headers. */
- const char *key;
-
- /* Internal code used for this authn type. */
- int type;
-
- /* The context initialization function if any; otherwise, NULL */
- serf__init_context_func_t init_ctx_func;
-
- /* The connection initialization function if any; otherwise, NULL */
- serf__init_conn_func_t init_conn_func;
-
- /* The authentication handler function */
- serf__auth_handler_func_t handle_func;
-
- /* Function to set up the authentication header of a request */
- serf__setup_request_func_t setup_request_func;
-
- /* Function to validate the authentication header of a response */
- serf__validate_response_func_t validate_response_func;
-};
-
/* Perform authentication related initialization of connection CONN. */
apr_status_t serf__auth_setup_connection(peer_t peer,
serf_connection_t *conn);