Commit d4959145 authored by Stefan Eissing's avatar Stefan Eissing
Browse files

On the 2.4.x-mod_md branch: 

Merged /httpd/httpd/trunk:r1818308,1818725,1818792,1818849



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-mod_md@1818850 13f79535-47bb-0310-9956-ffa450edef68
parent 12228098

modules/md/md_acme.c

+16 −0
Original line number Diff line number Diff line 
/* Licensed to the Apache Software Foundation (ASF) under one or more

 * contributor license agreements.  See the NOTICE file distributed with

 * this work for additional information regarding copyright ownership.

 * The ASF licenses this file to You under the Apache License, Version 2.0

 * (the "License"); you may not use this file except in compliance with

 * the License.  You may obtain a copy of the License at

 *

 *     http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

 

/* Copyright 2017 greenbytes GmbH (https://www.greenbytes.de)

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

modules/md/md_acme_acct.c

+16 −0
Original line number Diff line number Diff line 
/* Licensed to the Apache Software Foundation (ASF) under one or more

 * contributor license agreements.  See the NOTICE file distributed with

 * this work for additional information regarding copyright ownership.

 * The ASF licenses this file to You under the Apache License, Version 2.0

 * (the "License"); you may not use this file except in compliance with

 * the License.  You may obtain a copy of the License at

 *

 *     http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

 

/* Copyright 2017 greenbytes GmbH (https://www.greenbytes.de)

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

modules/md/md_acme_authz.c

+30 −2
Original line number Diff line number Diff line 
/* Licensed to the Apache Software Foundation (ASF) under one or more

 * contributor license agreements.  See the NOTICE file distributed with

 * this work for additional information regarding copyright ownership.

 * The ASF licenses this file to You under the Apache License, Version 2.0

 * (the "License"); you may not use this file except in compliance with

 * the License.  You may obtain a copy of the License at

 *

 *     http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

 

/* Copyright 2017 greenbytes GmbH (https://www.greenbytes.de)

 *

 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -219,13 +235,25 @@ apr_status_t md_acme_authz_update(md_acme_authz_t *authz, md_acme_t *acme, 
    }

    else if (s && !strcmp(s, "valid")) {

        authz->state = MD_ACME_AUTHZ_S_VALID;

        if (md_log_is_level(p, MD_LOG_DEBUG)) {

            md_log_perror(MD_LOG_MARK, MD_LOG_DEBUG, 0, p, "ACME server validated challenge "

                          "for %s in %s, ACME response is: %s", 

                          authz->domain, authz->location, 

                          md_json_writep(json, p, MD_JSON_FMT_COMPACT));

        }

    }

    else if (s && !strcmp(s, "invalid")) {

        authz->state = MD_ACME_AUTHZ_S_INVALID;

        md_log_perror(MD_LOG_MARK, MD_LOG_ERR, 0, p, "ACME server reports challenge "

                      "for %s in %s as 'invalid', ACME response is: %s", 

                      authz->domain, authz->location, 

                      md_json_writep(json, p, MD_JSON_FMT_COMPACT));

    }

    else if (s) {

        md_log_perror(MD_LOG_MARK, MD_LOG_WARNING, 0, p, "unknown authz state '%s' "

                      "for %s in %s", s, authz->domain, authz->location);

        md_log_perror(MD_LOG_MARK, MD_LOG_ERR, 0, p, "ACME server reports unrecognized "

                      "authz state '%s' for %s in %s, ACME response is: %s", 

                      s, authz->domain, authz->location, 

                      md_json_writep(json, p, MD_JSON_FMT_COMPACT));

        return APR_EINVAL;

    }

    return rv;

modules/md/md_acme_drive.c

+17 −8
Original line number Diff line number Diff line 
/* Licensed to the Apache Software Foundation (ASF) under one or more

 * contributor license agreements.  See the NOTICE file distributed with

 * this work for additional information regarding copyright ownership.

 * The ASF licenses this file to You under the Apache License, Version 2.0

 * (the "License"); you may not use this file except in compliance with

 * the License.  You may obtain a copy of the License at

 *

 *     http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

 

/* Copyright 2017 greenbytes GmbH (https://www.greenbytes.de)

 *

 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -550,18 +566,11 @@ static apr_status_t get_chain(void *baton, int attempt) 
{

    md_proto_driver_t *d = baton;

    md_acme_driver_t *ad = d->baton;

    md_cert_t *cert;

    const char *prev_link = NULL;

    apr_status_t rv = APR_SUCCESS;



    while (APR_SUCCESS == rv && ad->chain->nelts < 10) {

        int nelts = ad->chain->nelts;

        if (ad->chain && nelts > 0) {

            cert = APR_ARRAY_IDX(ad->chain, nelts - 1, md_cert_t *);

        }

        else {

            cert = ad->cert;

        }

        

        if (ad->next_up_link && (!prev_link || strcmp(prev_link, ad->next_up_link))) {

            prev_link = ad->next_up_link;
@@ -885,7 +894,7 @@ static apr_status_t acme_stage(md_proto_driver_t *d) 
                /**

                 * The MD is complete and un-expired. This is a renewal run. 

                 * Give activation 24 hours leeway (if we have that time) to

                 * accomodate for clients with somewhat weird clocks.

                 * accommodate for clients with somewhat weird clocks.

                 */

                delay_activation = apr_time_from_sec(MD_SECS_PER_DAY);

                if (delay_activation > (max_delay = d->md->expires - now)) {

modules/md/md_core.c

+16 −0
Original line number Diff line number Diff line 
/* Licensed to the Apache Software Foundation (ASF) under one or more

 * contributor license agreements.  See the NOTICE file distributed with

 * this work for additional information regarding copyright ownership.

 * The ASF licenses this file to You under the Apache License, Version 2.0

 * (the "License"); you may not use this file except in compliance with

 * the License.  You may obtain a copy of the License at

 *

 *     http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

 

/* Copyright 2017 greenbytes GmbH (https://www.greenbytes.de)

 *

 * Licensed under the Apache License, Version 2.0 (the "License");