Commit 6c123dc4 authored by Stefan Eissing's avatar Stefan Eissing
Browse files

adding a2md build to modules/md, installed in bin 

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-md@1804405 13f79535-47bb-0310-9956-ffa450edef68
parent bcffa33c

modules/md/Makefile

+15 −1
Original line number Diff line number Diff line
@@ -44,8 +44,22 @@ LTLIBRARY_SOURCES = \ 


LTLIBRARY_DEPENDENCIES = md.h



local-shared-build: $(LTLIBRARY_NAME) $(SHARED_TARGETS)



a2md_OBJECTS = \

	md_cmd_main.c \

	md_cmd_acme.c \

	md_cmd_reg.c \

	md_cmd_store.c



a2md: $(a2md_OBJECTS) $(LTLIBRARY_NAME)

	$(LINK) $(a2md_LTFLAGS) $(a2md_OBJECTS) -lmd $(A2MD_LDADD) $(AP_LIBS)



# top be installed in bin dir

bin_PROGRAMS = a2md



TARGETS = $(bin_PROGRAMS)



local-shared-build: $(LTLIBRARY_NAME) $(SHARED_TARGETS) a2md



include $(top_srcdir)/build/library.mk

include $(top_srcdir)/build/special.mk

modules/md/Makefile.in

+15 −1
Original line number Diff line number Diff line
@@ -39,8 +39,22 @@ LTLIBRARY_SOURCES = \ 


LTLIBRARY_DEPENDENCIES = md.h



local-shared-build: $(LTLIBRARY_NAME) $(SHARED_TARGETS)



a2md_OBJECTS = \

	md_cmd_main.c \

	md_cmd_acme.c \

	md_cmd_reg.c \

	md_cmd_store.c



a2md: $(a2md_OBJECTS) $(LTLIBRARY_NAME)

	$(LINK) $(a2md_LTFLAGS) $(a2md_OBJECTS) -lmd $(A2MD_LDADD) $(AP_LIBS)



# top be installed in bin dir

bin_PROGRAMS = a2md



TARGETS = $(bin_PROGRAMS)



local-shared-build: $(LTLIBRARY_NAME) $(SHARED_TARGETS) a2md



include $(top_srcdir)/build/library.mk

include $(top_srcdir)/build/special.mk

modules/md/config2.m4

+1 −0
Original line number Diff line number Diff line
@@ -270,6 +270,7 @@ APACHE_MODULE(md, [Managed Domain handling], $md_objs, , most, [ 
    fi

    

    APR_ADDTO(MOD_MD_LDADD, [ "libmd.la" ])

    APR_ADDTO(A2MD_LDADD, [ "libmd.la" ])

])



# Ensure that other modules can pick up mod_md.h

modules/md/md_cmd.h

0 → 100644
+87 −0
Original line number Diff line number Diff line 
/* Copyright 2017 greenbytes GmbH (https://www.greenbytes.de)

 *

 * Licensed 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.

 */



#ifndef md_cmd_h

#define md_cmd_h



struct apr_getopt_option_t;

struct apr_table_t;

struct md_json_t;

struct md_store_t;

struct md_ref_t;

struct md_acme_t;



typedef struct md_opts md_opts;

typedef struct md_cmd_ctx  md_cmd_ctx;

typedef struct md_cmd_t md_cmd_t;



typedef apr_status_t md_cmd_opt_fn(md_cmd_ctx *ctx, int option, const char *optarg);

typedef apr_status_t md_cmd_do_fn(md_cmd_ctx *ctx, const md_cmd_t *cmd);



struct md_cmd_ctx {

    apr_pool_t *p;

    

    const char *base_dir;

    const char *ca_url;

    

    struct md_store_t *store;

    struct md_reg_t *reg;

    struct md_acme_t *acme;



    struct apr_table_t *options;

    

    const char *tos;



    struct md_json_t *json_out;

    

    int argc;

    const char *const *argv;

};



int md_cmd_ctx_has_option(md_cmd_ctx *ctx, const char *key);

const char *md_cmd_ctx_get_option(md_cmd_ctx *ctx, const char *key);



void md_cmd_ctx_set_option(md_cmd_ctx *ctx, const char *key, const char *value);





/* needs */

#define MD_CTX_NONE            0x0000

#define MD_CTX_STORE           0x0001

#define MD_CTX_REG             0x0002

#define MD_CTX_ACME            0x0004



struct md_cmd_t {

    const char *name;                   /* command name */

    int needs;                          /* command needs: store, reg, acme etc. */

    

    md_cmd_opt_fn *opt_fn;              /* callback for options handling */

    md_cmd_do_fn *do_fn;                /* callback for executing the command */

    

    const struct apr_getopt_option_t *opts;    /* options definitions */

    const md_cmd_t **sub_cmds;          /* sub commands of this command or NULL */

    

    const char *synopsis;               /* command line synopsis for this command */

    const char *description;            /* textual description of this command */

};



extern apr_getopt_option_t MD_NoOptions[];



apr_status_t usage(const md_cmd_t *cmd, const char *msg);



apr_array_header_t *md_cmd_gather_args(md_cmd_ctx *ctx, int index);



void md_cmd_print_md(md_cmd_ctx *ctx, const md_t *md);



#endif /* md_cmd_h */

modules/md/md_cmd_acme.c

0 → 100644
+288 −0
Original line number Diff line number Diff line 
/* Copyright 2017 greenbytes GmbH (https://www.greenbytes.de)

 *

 * Licensed 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.

 */



#include <stdio.h>

#include <stdlib.h>



#include <apr_lib.h>

#include <apr_buckets.h>

#include <apr_getopt.h>

#include <apr_hash.h>

#include <apr_strings.h>



#include "md.h"

#include "md_acme.h"

#include "md_acme_acct.h"

#include "md_acme_authz.h"

#include "md_json.h"

#include "md_http.h"

#include "md_log.h"

#include "md_reg.h"

#include "md_store.h"

#include "md_util.h"

#include "md_version.h"

#include "md_cmd.h"

#include "md_cmd_acme.h"



/**************************************************************************************************/

/* command: acme newreg */



static apr_status_t cmd_acme_newreg(md_cmd_ctx *ctx, const md_cmd_t *cmd)

{

    apr_status_t rv = APR_SUCCESS;

    int i;

    

    apr_array_header_t *contacts = apr_array_make(ctx->p, 5, sizeof(const char *));

    for (i = 0; i < ctx->argc; ++i) {

        APR_ARRAY_PUSH(contacts, const char *) = md_util_schemify(ctx->p, ctx->argv[i], "mailto");

    }

    if (apr_is_empty_array(contacts)) {

        return usage(cmd, "newreg needs at least one contact email as argument");

    }



    if (APR_SUCCESS == (rv = md_acme_create_acct(ctx->acme, ctx->p, contacts, ctx->tos))) {

        md_acme_save(ctx->acme, ctx->store, ctx->p);

        fprintf(stdout, "registered: %s\n", md_acme_get_acct(ctx->acme, ctx->p));

    }

    else {

        md_log_perror(MD_LOG_MARK, MD_LOG_ERR, rv, ctx->p, "register new account");

    }

    

    return rv;

}



static md_cmd_t AcmeNewregCmd = {

    "newreg", MD_CTX_ACME, 

    NULL, cmd_acme_newreg, MD_NoOptions, NULL,

    "newreg contact-uri [contact-uri...]",

    "register a new account at ACME server with given contact uri (email)",

};



/**************************************************************************************************/

/* command: acme agree */



static apr_status_t acct_agree_tos(md_cmd_ctx *ctx, const char *name, 

                                   const char *tos, apr_pool_t *p) 

{

    apr_status_t rv;

    

    if (APR_SUCCESS == (rv = md_acme_use_acct(ctx->acme, ctx->store, ctx->p, name))) {

        if (!tos) {

            tos = ctx->acme->acct->agreement;

            if (!tos) {

                return APR_BADARG;

            }

        }

        rv = md_acme_agree(ctx->acme, ctx->p, tos);

        if (rv == APR_SUCCESS) {

            rv = md_acme_save(ctx->acme, ctx->store, ctx->p);

            fprintf(stdout, "agreed terms-of-service: %s\n", ctx->acme->acct->url);

        }

        else {

            md_log_perror(MD_LOG_MARK, MD_LOG_ERR, rv, p, "agree to terms-of-service %s", tos);

        }

    }

    else if (APR_ENOENT == rv) {

        md_log_perror(MD_LOG_MARK, MD_LOG_ERR, rv, p, "unknown account: %s", name);

    }



    return rv;

}



static apr_status_t cmd_acme_agree(md_cmd_ctx *ctx, const md_cmd_t *cmd)

{

    apr_status_t rv = APR_SUCCESS;

    int i;

    

    for (i = 0; i < ctx->argc; ++i) {

        rv = acct_agree_tos(ctx, ctx->argv[i], ctx->tos, ctx->p);

        if (rv != APR_SUCCESS) {

            break;

        }

    }

    return rv;

}



static md_cmd_t AcmeAgreeCmd = {

    "agree", MD_CTX_STORE|MD_CTX_ACME, 

    NULL, cmd_acme_agree, MD_NoOptions, NULL,

    "agree account",

    "agree to ACME terms of service",

};



/**************************************************************************************************/

/* command: acme validate */



static apr_status_t acct_validate(md_cmd_ctx *ctx, const char *name, apr_pool_t *p) 

{

    apr_status_t rv;

    

    if (APR_SUCCESS == (rv = md_acme_use_acct(ctx->acme, ctx->store, ctx->p, name))) {

        fprintf(stdout, "account valid: %s\n", name);

    }

    else if (APR_ENOENT == rv) {

        fprintf(stderr, "unknown account: %s", name);

    }

    else {

        md_log_perror(MD_LOG_MARK, MD_LOG_ERR, rv, p, "validating account: %s", name);

    }

    return rv;

}



static apr_status_t cmd_acme_validate(md_cmd_ctx *ctx, const md_cmd_t *cmd)

{

    apr_status_t rv = APR_SUCCESS;

    int i;

    

    for (i = 0; i < ctx->argc; ++i) {

        rv = acct_validate(ctx, ctx->argv[i], ctx->p);

        if (rv != APR_SUCCESS) {

            break;

        }

    }

    return rv;

}



static md_cmd_t AcmeValidateCmd = {

    "validate", MD_CTX_STORE|MD_CTX_ACME, 

    NULL, cmd_acme_validate, MD_NoOptions, NULL,

    "validate account",

    "validate account existence",

};



/**************************************************************************************************/

/* command: acme delreg */



static apr_status_t acme_delreg(md_cmd_ctx *ctx, const char *name, apr_pool_t *p) 

{

    apr_status_t rv;

    

    if (ctx->acme) {

        if (APR_SUCCESS == (rv = md_acme_use_acct(ctx->acme, ctx->store, ctx->p, name))) {

            rv = md_acme_delete_acct(ctx->acme, ctx->store, ctx->p);

            if (rv == APR_SUCCESS) {

                fprintf(stdout, "deleted: %s\n", name);

            }

            else {

                md_log_perror(MD_LOG_MARK, MD_LOG_ERR, rv, p, "delete account");

            }

        }

        else if (APR_ENOENT == rv) {

            md_log_perror(MD_LOG_MARK, MD_LOG_ERR, rv, p, "unknown account: %s", name);

        }

        else {

            md_log_perror(MD_LOG_MARK, MD_LOG_ERR, rv, p, "loading account: %s", name);

        }

    }

    else if (ctx->store) {

        rv = md_acme_unstore_acct(ctx->store, ctx->p, name);

    }

    else {

        rv = APR_EGENERAL;

    }

    return rv;

}



static apr_status_t cmd_acme_delreg(md_cmd_ctx *ctx, const md_cmd_t *cmd)

{

    apr_status_t rv = APR_SUCCESS;

    int i;

    

    for (i = 0; i < ctx->argc; ++i) {

        rv = acme_delreg(ctx, ctx->argv[i], ctx->p);

        if (rv != APR_SUCCESS) {

            break;

        }

    }

    return rv;

}



static md_cmd_t AcmeDelregCmd = {

    "delreg", MD_CTX_STORE, 

    NULL, cmd_acme_delreg, MD_NoOptions, NULL,

    "delreg account",

    "delete an existing ACME account",

};



/**************************************************************************************************/

/* command: acme authz */



static apr_status_t acme_newauthz(md_cmd_ctx *ctx, md_acme_acct_t *acct, const char *domain) 

{

    apr_status_t rv;

    md_acme_authz_t *authz;

    

    rv = md_acme_authz_register(&authz, ctx->acme, ctx->store, domain, ctx->p); 

    

    if (rv == APR_SUCCESS) {

        fprintf(stdout, "authz: %s %s\n", domain, authz->location);

    }

    else {

        md_log_perror(MD_LOG_MARK, MD_LOG_ERR, rv, ctx->p, "register new authz");

    }

    return rv;

}



static apr_status_t cmd_acme_authz(md_cmd_ctx *ctx, const md_cmd_t *cmd)

{

    const char *s;

    apr_status_t rv;

    int i;

    

    if (ctx->argc <= 0) {

        return usage(cmd, NULL);

    }

    s = ctx->argv[0];

    if (APR_SUCCESS == (rv = md_acme_use_acct(ctx->acme, ctx->store, ctx->p, s))) {

        for (i = 1; i < ctx->argc; ++i) {

            rv = acme_newauthz(ctx, ctx->acme->acct, ctx->argv[i]);

            if (rv != APR_SUCCESS) {

                break;

            }

        }

    }

    else if (APR_ENOENT == rv) {

        fprintf(stderr, "unknown account: %s\n", s);

        return APR_EGENERAL;

    }

    

    return rv;

}



static md_cmd_t AcmeAuthzCmd = {

    "authz", MD_CTX_STORE|MD_CTX_ACME, 

    NULL, cmd_acme_authz, MD_NoOptions, NULL,

    "authz account domain",

    "request a new authorization for an account and domain",

};



/**************************************************************************************************/

/* command: acme */



static const md_cmd_t *AcmeSubCmds[] = {

    &AcmeNewregCmd,

    &AcmeDelregCmd,

    &AcmeAgreeCmd,

    &AcmeAuthzCmd,

    &AcmeValidateCmd,

    NULL

};



md_cmd_t MD_AcmeCmd = {

    "acme", MD_CTX_STORE,  

    NULL, NULL, MD_NoOptions, AcmeSubCmds,

    "acme cmd [opts] [args]", 

    "play with the ACME server", 

};