Fri, 30 Dec 2016 14:15:52 +0100
many fixes
fixes pathcheck with more than one saf
fixes log config
acl_evaluate sets auth vars now
fixes session ssl flag
cgi sets https env
require_access saf fix
/* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * * Copyright 2013 Olaf Wintermann. 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. * * 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 HTTPLISTENER_H #define HTTPLISTENER_H #include "sessionhandler.h" #include "threadpools.h" #include "config.h" #include "../util/systems.h" #include <openssl/bio.h> #include <openssl/ssl.h> #include <openssl/err.h> #ifdef __cplusplus extern "C" { #endif /* HttpListener typedef in nsapi.h */ typedef struct _acceptor Acceptor; typedef struct _listener_config ListenerConfig; typedef struct _http_ssl HttpSSL; union vs { VirtualServer *vs; char *vs_name; }; struct _listener_config { ServerConfiguration *cfg; sstr_t name; sstr_t vs; sstr_t threadpool; char *address; int port; int nacceptors; WSBool blockingio; WSBool ssl; sstr_t certfile; sstr_t privkeyfile; sstr_t chainfile; sstr_t disable_proto; }; struct _acceptor { pthread_t tid; HttpListener *listener; }; struct _http_listener { ServerConfiguration *cfg; sstr_t name; union vs default_vs; int port; int server_socket; SessionHandler *session_handler; threadpool_t *threadpool; HttpListener *next; Acceptor **acceptors; int nacceptors; int running; HttpSSL *ssl; uint32_t ref; // reference counter }; struct _http_ssl { unsigned char *cert; size_t certlen; unsigned char *privkey; size_t privkeylen; unsigned char *chain; size_t chainlen; SSL_CTX *sslctx; // TODO: ssl/tls cipher, ... config }; int start_all_listener(); HttpListener* http_listener_create(ListenerConfig *conf); // used by http_listener_create HttpListener* http_listener_new(ListenerConfig *conf); int http_listener_start(HttpListener *listener); void http_listener_ref(HttpListener *listener); void http_listener_unref(HttpListener *listener); Acceptor* acceptor_new(HttpListener *listener); void acceptor_start(Acceptor *a); void* acceptor_thread(Acceptor *a); #ifdef __cplusplus } #endif #endif /* HTTPLISTENER_H */