1
0
mirror of https://github.com/apache/httpd.git synced 2025-08-05 16:55:50 +03:00

249 Commits

Author SHA1 Message Date
Doug MacEachern
880f2678e5 dropping hungarian notation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93860 13f79535-47bb-0310-9956-ffa450edef68
2002-03-12 16:50:44 +00:00
Doug MacEachern
f939dea4e8 minor style changes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93859 13f79535-47bb-0310-9956-ffa450edef68
2002-03-12 16:44:18 +00:00
Doug MacEachern
05d83f393a no need to call SSL_clear() after SSL_new()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93824 13f79535-47bb-0310-9956-ffa450edef68
2002-03-10 00:29:49 +00:00
Doug MacEachern
5f33a419b4 don't allocate SSLConnRec unless ssl is enabled on this vhost.
also provides a shorter shortcut for mod_ssl hooks to decline if ssl
is not enabled.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93823 13f79535-47bb-0310-9956-ffa450edef68
2002-03-10 00:22:07 +00:00
William A. Rowe Jr
7b21fb2549 Introduce the PassPhraseDialog 'pipe' mechanism.
This is the directive handling commit only, the mechanics patch will
  follow.  PassPhraseDialog "|/path/to/pipe" will use the bidirectional
  pipe to have a 'conversation', along the lines of the tty dialog with
  PassPhraseDialog 'builtin'.  This is entirely different than the 'exec'
  method, which simply runs once for each passphrase, and doesn't allow
  for failure/retries, and certainly doesn't offer any sensible 'dialog'.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93606 13f79535-47bb-0310-9956-ffa450edef68
2002-02-27 19:51:33 +00:00
Ryan Bloom
862f407872 Remove the install_transport_filters hook. The same function can be
acheived with the pre_connection hook.  I have added the socket to the
pre_connection phase to make this possible.
Reviewed by:	Bill Stoddard


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93259 13f79535-47bb-0310-9956-ffa450edef68
2002-02-05 22:18:49 +00:00
Aaron Bannert
d5fdaf9cfd The pre_config hook now takes a return value. This allows modules to
cause the server to bail out under error conditions.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93063 13f79535-47bb-0310-9956-ffa450edef68
2002-01-28 23:49:40 +00:00
Doug MacEachern
d06327e27b the client cert X509_NAME_oneline() is only used if SSLFakeBasicAuth
is happening.  so avoid calling that unless needed and just stash a
pointer to the client cert for the boolean checks that the client
provided a cert.
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92240 13f79535-47bb-0310-9956-ffa450edef68
2001-11-29 07:07:36 +00:00
Doug MacEachern
706c0cceee calculate VHostID length at startup rather than request time.
change ap_md5() call in ssl_hook_pre_connection() to ap_md5_binary()
that uses the precalculated sc->nVHostID_length to avoid a strlen() call.

PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92216 13f79535-47bb-0310-9956-ffa450edef68
2001-11-28 05:50:55 +00:00
Doug MacEachern
9c7cc5063d avoid calling ssl_util_vhostid() (and apr_sprintf underneath) at
request time by calling it at startup time and saving the value in the
SSLSrvConfigRec.
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92215 13f79535-47bb-0310-9956-ffa450edef68
2001-11-28 05:44:50 +00:00
Doug MacEachern
5f4bcccd5d replace strlen(cpVHostMD5) with MD5_DIGESTSIZE*2 in ssl_hook_pre_connection()
since we know the string returned by ap_md5() will always be that length
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92213 13f79535-47bb-0310-9956-ffa450edef68
2001-11-28 05:05:04 +00:00
Doug MacEachern
1c1f3fb96f remove unused ssl:🤝:timeout references
(core handles all timeouts)
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92211 13f79535-47bb-0310-9956-ffa450edef68
2001-11-28 04:31:34 +00:00
Doug MacEachern
03d6bfb025 avoid a couple of calls to ssl_util_vhostid() and apr_psprintf()
unless loglevel >= SSL_LOG_INFO
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92122 13f79535-47bb-0310-9956-ffa450edef68
2001-11-22 02:44:35 +00:00
Doug MacEachern
a626a1af07 get rid of 'apctx' table that used to live in SSL_get_app_data2(ssl)
change app_data2 to be the request_rec itself.
if something needs per-request context in the future,
it can use r->request_config

PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92113 13f79535-47bb-0310-9956-ffa450edef68
2001-11-22 00:42:35 +00:00
Doug MacEachern
9dc6d34af4 move c->notes.ssl::verify::depth to SSLConnRec.verify_depth
note: may actually be removed unless somebody can figure out why it is in
there to begin with
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92111 13f79535-47bb-0310-9956-ffa450edef68
2001-11-22 00:25:00 +00:00
Doug MacEachern
38ee9028fc move c->notes.ssl::verify::{info,error} to SSLConnRec.verify_{info,error}
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92109 13f79535-47bb-0310-9956-ffa450edef68
2001-11-21 22:29:14 +00:00
Doug MacEachern
0e5e9c10a2 move c->notes.ssl::client::dn to SSLConnRec.client_dn
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92094 13f79535-47bb-0310-9956-ffa450edef68
2001-11-21 18:08:33 +00:00
Doug MacEachern
6a641aae9c start moving c->notes usage to a new SSLConnRec structure hanging off of
c->conn_config
PR:
Obtained from:
Submitted by:
Reviewed by: rbb, madhu


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92093 13f79535-47bb-0310-9956-ffa450edef68
2001-11-21 17:45:24 +00:00
Justin Erenkrantz
e3d203298e This is the mod_ssl input filtering rewrite. Lots of stuff here. I also
changed some of the style issues within the filtering code to conform to
the rest of the server.

Various incarnations of this patch have been posted to dev@httpd without
feedback.  Now that it passes all of the httpd-test cases (with the
exception of module/negotiation test which fails without mod_ssl anyway),
it is time to check it in.

Please review and test.  We are under C-T-R rules, so I'm going to take
advantage of that and commit it now.  I have tested this about as much
as I can and it seems to work from everything I can give to it.
Considering that mod_ssl was broken before this commit, this is an
improvement.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91414 13f79535-47bb-0310-9956-ffa450edef68
2001-10-11 01:49:21 +00:00
Doug MacEachern
fe0c7ffac1 dont block when handling non-ssl request
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90802 13f79535-47bb-0310-9956-ffa450edef68
2001-08-30 05:33:57 +00:00
Ryan Bloom
bfe91354fb Allow mod_ssl to send back an error message if an HTTP request is sent
over an HTTPS connection.  This also adds an ap_remove_input_filter
function, which should be used to remove the SSL input filter in this
case, as soon as this code is stressed a bit more.

For right now, we are sending the same message that we used to send in
mod_ssl for Apache 1.3.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90724 13f79535-47bb-0310-9956-ffa450edef68
2001-08-27 06:00:51 +00:00
Doug MacEachern
99bc864e36 enable i/o debugging
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90645 13f79535-47bb-0310-9956-ffa450edef68
2001-08-24 18:06:47 +00:00
Doug MacEachern
48c41169f0 support "SSLVerifyClient optional_no_ca"
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90599 13f79535-47bb-0310-9956-ffa450edef68
2001-08-24 00:09:30 +00:00
Doug MacEachern
aed6985251 prevent double lookup of ssl::verify::error
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90597 13f79535-47bb-0310-9956-ffa450edef68
2001-08-23 23:43:45 +00:00
William A. Rowe Jr
de9321e1e6 Complete the rename of the ssl_scache_status_register and
ssl_ext_proxy_register (which has yet to be renamed for it's
  future location, since I'm not going further at the moment
  with implementing it's functionallity, all my focus is on
  the ssl_var_register arm.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90524 13f79535-47bb-0310-9956-ffa450edef68
2001-08-23 00:06:27 +00:00
William A. Rowe Jr
dfc5bb55f4 Remove a ton o' cruft. Moves the mod_log_config 'var' extensions to
ssl_engine_vars.c.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90517 13f79535-47bb-0310-9956-ffa450edef68
2001-08-22 22:58:07 +00:00
Doug MacEachern
d792836690 remove #if 0-ed ssl_hook_NewConnection code; was only left for reference,
no longer needed
remove #if 0-ed ssl_hook_TimeoutConnection code; ssl no longer talks directly
to the socket
PR:
Obtained from:
Submitted by:    madhu
Reviewed by:	 dougm


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90511 13f79535-47bb-0310-9956-ffa450edef68
2001-08-22 21:37:15 +00:00
Doug MacEachern
5954ae6617 move some code duplication into ssl_abort() function
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90504 13f79535-47bb-0310-9956-ffa450edef68
2001-08-22 19:40:07 +00:00
Doug MacEachern
ba0d6156c9 Enable ssl client authentication at SSL_accept time
PR:
Obtained from:
Submitted by:	Madhusudan Mathihalli <madhusudan_mathihalli@hp.com>
Reviewed by: dougm


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90503 13f79535-47bb-0310-9956-ffa450edef68
2001-08-22 19:37:03 +00:00
William A. Rowe Jr
6333b12a2e Explicitly fix some types, and opt-out on macro conflicts
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90496 13f79535-47bb-0310-9956-ffa450edef68
2001-08-22 16:21:40 +00:00
Doug MacEachern
3468587a6c and swap Auth/UserCheck names to match the hook names, in hopes of preventing further foncusion
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90464 13f79535-47bb-0310-9956-ffa450edef68
2001-08-21 06:08:04 +00:00
Doug MacEachern
ac9c800d11 authentication/authorization hooks were backwards
make authentication hook run APR_HOOK_FIRST for FakeBasicAuth
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90463 13f79535-47bb-0310-9956-ffa450edef68
2001-08-21 05:57:13 +00:00
Doug MacEachern
6c69c6421a remove unused ssl_io_ functions
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90444 13f79535-47bb-0310-9956-ffa450edef68
2001-08-20 23:48:16 +00:00
Doug MacEachern
d09d7722c2 remove some unused hook code
enable child init hook
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90443 13f79535-47bb-0310-9956-ffa450edef68
2001-08-20 23:43:09 +00:00
Doug MacEachern
a3dbab2d7f at least make a note of SSL_R_HTTP_REQUEST error (until this is properly dealt with)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90229 13f79535-47bb-0310-9956-ffa450edef68
2001-08-16 17:17:16 +00:00
Doug MacEachern
5eb7150217 if ssl shutdown happens earlier than expected, filter code needs be aware
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90227 13f79535-47bb-0310-9956-ffa450edef68
2001-08-16 17:01:53 +00:00
Doug MacEachern
d79cea3d70 enable ssl Translate, UserCheck, Access and Auth hooks
add support for renegotiation during the Access hook
this requires hooking into the read and write SSL BIOs in order to
flush data to the client and read from the filter chain

this also requires that the ssl filters become "aware" that
renegotitation is in progress so that the BIOs are left alone for
SSL_renegotiate/SSL_do_handshake in ssl_hook_Access to deal with

PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90185 13f79535-47bb-0310-9956-ffa450edef68
2001-08-16 03:58:16 +00:00
William A. Rowe Jr
828dc11281 enables the use of the ssl_var_lookup functionality in the various source
files in modules/ssl. The ap_hook_* functions are still not yet ported to
Apache 2.0 style

Submitted by:	Madhusudan Mathihalli <madhusudan_mathihalli@hp.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89819 13f79535-47bb-0310-9956-ffa450edef68
2001-07-31 03:40:47 +00:00
William A. Rowe Jr
dc44adeeff Activate ssl_hook_pre_config
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89815 13f79535-47bb-0310-9956-ffa450edef68
2001-07-31 02:58:55 +00:00
William A. Rowe Jr
82cb29c823 Register for %X, %c (we gotta make a decision, please vote if you care...
use %c's meaning from the historical SSL modules, or Bill Stoddard's
  connection-terminated meaning?  One will have to give.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89807 13f79535-47bb-0310-9956-ffa450edef68
2001-07-30 22:35:33 +00:00
William A. Rowe Jr
d8f39cdd57 Workaround till connection_hook details are resolved
[MATHIHALLI,MADHUSUDAN <madhusudan_mathihalli@hp.com>]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89620 13f79535-47bb-0310-9956-ffa450edef68
2001-07-19 20:02:28 +00:00
Ralf S. Engelschall
ca8f54367f Apply mod_ssl MEGA porting patch. This is a cleaned up version of the
latest patches from Madhusudan which makes mod_ssl 95% working inside
Apache 2.0. There is still a lot of more work (both porting and cleanup)
to do be done. See modules/ssl/README for details.

Submitted by: Madhusudan Mathihalli <madhusudan_mathihalli@hp.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89618 13f79535-47bb-0310-9956-ffa450edef68
2001-07-19 16:08:01 +00:00
Doug MacEachern
d7d869e327 dummy ssl hooks need to return an int value for server to function with mod_ssl compiled in
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89566 13f79535-47bb-0310-9956-ffa450edef68
2001-07-17 16:36:15 +00:00
Martin Kraemer
b86e18b6fe Fix typos
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89113 13f79535-47bb-0310-9956-ffa450edef68
2001-05-14 10:53:33 +00:00
Ralf S. Engelschall
a0f48e90fa Change mostly all old module structure hooks and EAPI hooks to
ap_hook_xxx equivalents. More work has to be done here to clean all this
up and reduce to a minimum...


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89020 13f79535-47bb-0310-9956-ffa450edef68
2001-05-05 16:55:28 +00:00
Ralf S. Engelschall
fa3c8387ec Activate the command_rec structure.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89005 13f79535-47bb-0310-9956-ffa450edef68
2001-05-05 09:58:04 +00:00
Ralf S. Engelschall
680f9c0157 Integrate mod_ssl into the Autoconf facility.
(currently only stub files are compiled)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89002 13f79535-47bb-0310-9956-ffa450edef68
2001-05-05 09:25:52 +00:00
Ralf S. Engelschall
c9606e809a mod_ssl integration step 2:
transfer copyright of all code to ASF by using Apache Software License v1.1


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88995 13f79535-47bb-0310-9956-ffa450edef68
2001-05-04 22:21:17 +00:00
Ralf S. Engelschall
f83672781d Initial revision
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88988 13f79535-47bb-0310-9956-ffa450edef68
2001-05-04 21:54:25 +00:00