Commit 14778c9a authored by Bradley Nicholes's avatar Bradley Nicholes
Browse files

Validate the file path of the trusted certificate file at the time the... 

Validate the file path of the trusted certificate file at the time the LDAPTrushedCA directive is handled. PR#30782

Reviewed by: bnicholes, trawick, clar


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@104842 13f79535-47bb-0310-9956-ffa450edef68
parent 358a2e37

STATUS

+1 −6
Changes for STATUS: 1 added line, 6 removed lines.
Original line number Diff line number Diff line 
APACHE 2.0 STATUS:                                              -*-text-*-

Last modified at [$Date: 2004/08/26 22:16:52 $]

Last modified at [$Date: 2004/08/26 22:21:33 $]



Release:
@@ -83,11 +83,6 @@ PATCHES TO BACKPORT FROM 2.1 
       +1: stoddard, trawick

       nd: I'd like to add 1.169



    *) util_ldap: Validate the file path of the trusted certificate file 

       at the time the LDAPTrushedCA directive is handled. PR#30782

         modules/ldap/util_ldap.c: 1.9, 1.11

       +1: bnicholes, trawick, clar

       

    *) [SECURITY] mod_ssl: Fix potential input filter segfaults in SPECULATIVE mode.

       http://cvs.apache.org/viewcvs.cgi/httpd-2.0/modules/ssl/ssl_engine_io.c?r1=1.125&r2=1.126

       PR: 30134

modules/experimental/util_ldap.c

+12 −0
Changes for modules/experimental/util_ldap.c: 12 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -1084,6 +1084,9 @@ static const char *util_ldap_set_cert_auth(cmd_parms *cmd, void *dummy, const ch 
        (util_ldap_state_t *)ap_get_module_config(cmd->server->module_config, 

						  &ldap_module);

    const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);

    apr_finfo_t finfo;

    apr_status_t rv;



    if (err != NULL) {

        return err;

    }
@@ -1094,6 +1097,15 @@ static const char *util_ldap_set_cert_auth(cmd_parms *cmd, void *dummy, const ch 


    st->cert_auth_file = ap_server_root_relative(cmd->pool, file);



    if (st->cert_auth_file && 

        ((rv = apr_stat (&finfo, st->cert_auth_file, APR_FINFO_MIN, cmd->pool)) != APR_SUCCESS))

    {

        ap_log_error(APLOG_MARK, APLOG_ERR, rv, cmd->server, 

                     "LDAP: Could not open SSL trusted certificate authority file - %s", 

                     st->cert_auth_file == NULL ? file : st->cert_auth_file);

        return "Invalid file path";

    }



    return(NULL);

}