X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/tripe/blobdiff_plain/a50f9a0eaed03dfe85ff3d7a4c24da20ac705dae..fe2a5dcf:/server/tripe.h diff --git a/server/tripe.h b/server/tripe.h index 47c8cf0f..b4eee1b3 100644 --- a/server/tripe.h +++ b/server/tripe.h @@ -52,6 +52,7 @@ #include #include #include +#include #include #include @@ -70,9 +71,11 @@ #include #include #include +#include #include #include #include +#include #include #include #include @@ -103,6 +106,7 @@ #include #include +#include "priv.h" #include "protocol.h" #include "slip.h" #include "util.h" @@ -122,8 +126,9 @@ #define T_KEYEXCH 64u #define T_KEYMGMT 128u #define T_CHAL 256u +/* T_PRIVSEP in priv.h */ -#define T_ALL 511u +#define T_ALL 1023u /* --- Units --- */ @@ -144,10 +149,29 @@ typedef struct algswitch { const gcmac *m; /* Message authentication code */ size_t hashsz; /* Hash output size */ size_t tagsz; /* Length to truncate MAC tags */ + size_t expsz; /* Size of data to process */ size_t cksz, mksz; /* Key lengths for @c@ and @m@ */ } algswitch; -extern algswitch algs; +typedef struct kdata { + unsigned ref; /* Reference counter */ + struct knode *kn; /* Pointer to cache entry */ + char *tag; /* Full tag name of the key */ + group *g; /* The group we work in */ + size_t indexsz; /* Size of exponent for the group */ + mp *kpriv; /* The private key (or null) */ + ge *kpub; /* The public key */ + time_t t_exp; /* Expiry time of the key */ + algswitch algs; /* Collection of algorithms */ +} kdata; + +typedef struct knode { + sym_base _b; /* Symbol table intrusion */ + unsigned f; /* Various flags */ +#define KNF_BROKEN 1u /* Don't use this key any more */ + struct keyhalf *kh; /* Pointer to the home keyhalf */ + kdata *kd; /* Pointer to the key data */ +} knode; #define MAXHASHSZ 64 /* Largest possible hash size */ @@ -204,7 +228,7 @@ typedef struct keyset { unsigned ref; /* Reference count for keyset */ struct peer *p; /* Pointer to peer structure */ time_t t_exp; /* Expiry time for this keyset */ - unsigned long sz_exp; /* Data limit for the keyset */ + unsigned long sz_exp, sz_regen; /* Data limits for the keyset */ T( unsigned seq; ) /* Sequence number for tracing */ unsigned f; /* Various useful flags */ gcipher *cin, *cout; /* Keyset ciphers for encryption */ @@ -220,6 +244,8 @@ typedef struct keyset { #define KSERR_REGEN -1 /* Regenerate keys */ #define KSERR_NOKEYS -2 /* No keys left */ #define KSERR_DECRYPT -3 /* Unable to decrypt message */ +#define KSERR_SEQ -4 /* Incorrect sequence number */ +#define KSERR_MALFORMED -5 /* Input ciphertext is broken */ /* --- Key exchange --- * * @@ -249,12 +275,12 @@ typedef struct kxchal { typedef struct keyexch { struct peer *p; /* Pointer back to the peer */ + kdata *kpriv; /* Private key and related info */ + kdata *kpub; /* Peer's public key */ keyset **ks; /* Peer's list of keysets */ unsigned f; /* Various useful flags */ unsigned s; /* Current state in exchange */ sel_timer t; /* Timer for next exchange */ - ge *kpub; /* Peer's public key */ - time_t texp_kpub; /* Expiry time for public key */ mp *alpha; /* My temporary secret */ ge *c; /* My challenge */ ge *rx; /* The expected response */ @@ -286,8 +312,10 @@ struct peer; typedef struct tunnel_ops { const char *name; /* Name of this tunnel driver */ + unsigned flags; /* Various interesting flags */ +#define TUNF_PRIVOPEN 1u /* Need helper to open file */ void (*init)(void); /* Initializes the system */ - tunnel *(*create)(struct peer */*p*/, char **/*ifn*/); + tunnel *(*create)(struct peer */*p*/, int /*fd*/, char **/*ifn*/); /* Initializes a new tunnel */ void (*setifname)(tunnel */*t*/, const char */*ifn*/); /* Notifies ifname change */ @@ -325,11 +353,15 @@ typedef struct stats { typedef struct peerspec { char *name; /* Peer's name */ + char *privtag; /* Private key tag */ + char *tag; /* Public key tag */ const tunnel_ops *tops; /* Tunnel operations */ unsigned long t_ka; /* Keep alive interval */ addr sa; /* Socket address to speak to */ size_t sasz; /* Socket address size */ - unsigned kxf; /* Key exchange flags to set */ + unsigned f; /* Flags for the peer */ +#define PSF_KXMASK 255u /* Key-exchange flags to set */ +#define PSF_MOBILE 256u /* Address may change rapidly */ } peerspec; typedef struct peer_byname { @@ -417,12 +449,6 @@ typedef struct admin_addop { peerspec peer; /* Peer pending creation */ } admin_addop; -typedef struct admin_greetop { - admin_resop r; /* Name resolution header */ - void *c; /* Challenge block */ - size_t sz; /* Length of challenge */ -} admin_greetop; - typedef struct admin_pingop { admin_bgop bg; /* Background operation header */ ping ping; /* Ping pending response */ @@ -492,13 +518,11 @@ typedef struct admin { /*----- Global variables --------------------------------------------------*/ extern sel_state sel; /* Global I/O event state */ -extern group *gg; /* The group we work in */ -extern size_t indexsz; /* Size of exponent for the group */ -extern mp *kpriv; /* Our private key */ -extern ge *kpub; /* Our public key */ extern octet buf_i[PKBUFSZ], buf_o[PKBUFSZ], buf_t[PKBUFSZ], buf_u[PKBUFSZ]; extern const tunnel_ops *tunnels[]; /* Table of tunnels (0-term) */ extern const tunnel_ops *tun_default; /* Default tunnel to use */ +extern kdata *master; /* Default private key */ +extern const char *tag_priv; /* Default private key tag */ #ifndef NTRACE extern const trace_opt tr_opts[]; /* Trace options array */ @@ -511,6 +535,21 @@ extern unsigned tr_flags; /* Trace options flags */ /*----- Key management ----------------------------------------------------*/ +/* --- @km_init@ --- * + * + * Arguments: @const char *privkr@ = private keyring file + * @const char *pubkr@ = public keyring file + * @const char *ptag@ = default private-key tag + * + * Returns: --- + * + * Use: Initializes the key-management machinery, loading the + * keyrings and so on. + */ + +extern void km_init(const char */*privkr*/, const char */*pubkr*/, + const char */*ptag*/); + /* --- @km_reload@ --- * * * Arguments: --- @@ -522,33 +561,60 @@ extern unsigned tr_flags; /* Trace options flags */ extern int km_reload(void); -/* --- @km_init@ --- * +/* --- @km_findpub@, @km_findpriv@ --- * + * + * Arguments: @const char *tag@ = key tag to load * - * Arguments: @const char *kr_priv@ = private keyring file - * @const char *kr_pub@ = public keyring file - * @const char *tag@ = tag to load + * Returns: Pointer to the kdata object if successful, or null on error. + * + * Use: Fetches a public or private key from the keyring. + */ + +extern kdata *km_findpub(const char */*tag*/); +extern kdata *km_findpriv(const char */*tag*/); + +/* --- @km_samealgsp@ --- * + * + * Arguments: @const kdata *kdx, *kdy@ = two key data objects + * + * Returns: Nonzero if their two algorithm selections are the same. + * + * Use: Checks sameness of algorithm selections: used to ensure that + * peers are using sensible algorithms. + */ + +extern int km_samealgsp(const kdata */*kdx*/, const kdata */*kdy*/); + +/* --- @km_ref@ --- * + * + * Arguments: @kdata *kd@ = pointer to the kdata object * * Returns: --- * - * Use: Initializes, and loads the private key. + * Use: Claim a new reference to a kdata object. */ -extern void km_init(const char */*kr_priv*/, const char */*kr_pub*/, - const char */*tag*/); +extern void km_ref(kdata */*kd*/); -/* --- @km_getpubkey@ --- * +/* --- @km_unref@ --- * * - * Arguments: @const char *tag@ = public key tag to load - * @ge *kpub@ = where to put the public key - * @time_t *t_exp@ = where to put the expiry time + * Arguments: @kdata *kd@ = pointer to the kdata object * - * Returns: Zero if OK, nonzero if it failed. + * Returns: --- * - * Use: Fetches a public key from the keyring. + * Use: Releases a reference to a kdata object. */ -extern int km_getpubkey(const char */*tag*/, ge */*kpub*/, - time_t */*t_exp*/); +extern void km_unref(kdata */*kd*/); + +/* --- @km_tag@ --- * + * + * Arguments: @kdata *kd@ - pointer to the kdata object + * + * Returns: A pointer to the short tag by which the kdata was loaded. + */ + +extern const char *km_tag(kdata */*kd*/); /*----- Key exchange ------------------------------------------------------*/ @@ -823,6 +889,50 @@ extern int c_check(buf */*b*/); #define A_END ((char *)0) +/* --- @a_vformat@ --- * + * + * Arguments: @dstr *d@ = where to leave the formatted message + * @const char *fmt@ = pointer to format string + * @va_list ap@ = arguments in list + * + * Returns: --- + * + * Use: Main message token formatting driver. The arguments are + * interleaved formatting tokens and their parameters, finally + * terminated by an entry @A_END@. + * + * Tokens recognized: + * + * * "*..." ... -- pretokenized @dstr_putf@-like string + * + * * "?ADDR" SOCKADDR -- a socket address, to be converted + * + * * "?B64" BUFFER SIZE -- binary data to be base64-encoded + * + * * "?TOKENS" VECTOR -- null-terminated vector of tokens + * + * * "?PEER" PEER -- peer's name + * + * * "?ERRNO" ERRNO -- system error code + * + * * "[!]..." ... -- @dstr_putf@-like string as single token + */ + +extern void a_vformat(dstr */*d*/, const char */*fmt*/, va_list /*ap*/); + +/* --- @a_format@ --- * + * + * Arguments: @dstr *d@ = where to leave the formatted message + * @const char *fmt@ = pointer to format string + * + * Returns: --- + * + * Use: Writes a tokenized message into a string, for later + * presentation. + */ + +extern void a_format(dstr */*d*/, const char */*fmt*/, ...); + /* --- @a_warn@ --- * * * Arguments: @const char *fmt@ = pointer to format string @@ -897,13 +1007,17 @@ extern void a_daemon(void); /* --- @a_init@ --- * * * Arguments: @const char *sock@ = socket name to create + * @uid_t u@ = user to own the socket + * @gid_t g@ = group to own the socket + * @mode_t m@ = permissions to set on the socket * * Returns: --- * * Use: Creates the admin listening socket. */ -extern void a_init(const char */*sock*/); +extern void a_init(const char */*sock*/, + uid_t /*u*/, gid_t /*g*/, mode_t /*m*/); /*----- Mapping with addresses as keys ------------------------------------*/ @@ -959,6 +1073,68 @@ extern void *am_find(addrmap */*m*/, const addr */*a*/, extern void am_remove(addrmap */*m*/, void */*i*/); +/*----- Privilege separation ----------------------------------------------*/ + +/* --- @ps_trace@ --- * + * + * Arguments: @unsigned mask@ = trace mask to check + * @const char *fmt@ = message format + * @...@ = values for placeholders + * + * Returns: --- + * + * Use: Writes a trace message. + */ + +T( extern void ps_trace(unsigned /*mask*/, const char */*fmt*/, ...); ) + +/* --- @ps_warn@ --- * + * + * Arguments: @const char *fmt@ = message format + * @...@ = values for placeholders + * + * Returns: --- + * + * Use: Writes a warning message. + */ + +extern void ps_warn(const char */*fmt*/, ...); + +/* --- @ps_tunfd@ --- * + * + * Arguments: @const tunnel_ops *tops@ = pointer to tunnel operations + * @char **ifn@ = where to put the interface name + * + * Returns: The file descriptor, or @-1@ on error. + * + * Use: Fetches a file descriptor for a tunnel driver. + */ + +extern int ps_tunfd(const tunnel_ops */*tops*/, char **/*ifn*/); + +/* --- @ps_split@ --- * + * + * Arguments: @int detachp@ = whether to detach the child from its terminal + * + * Returns: --- + * + * Use: Separates off the privileged tunnel-opening service from the + * rest of the server. + */ + +extern void ps_split(int /*detachp*/); + +/* --- @ps_quit@ --- * + * + * Arguments: --- + * + * Returns: --- + * + * Use: Detaches from the helper process. + */ + +extern void ps_quit(void); + /*----- Peer management ---------------------------------------------------*/ /* --- @p_txstart@ --- * @@ -1146,6 +1322,24 @@ extern peer *p_create(peerspec */*spec*/); extern const char *p_name(peer */*p*/); +/* --- @p_tag@ --- * + * + * Arguments: @peer *p@ = pointer to a peer block + * + * Returns: A pointer to the peer's public key tag. + */ + +extern const char *p_tag(peer */*p*/); + +/* --- @p_privtag@ --- * + * + * Arguments: @peer *p@ = pointer to a peer block + * + * Returns: A pointer to the peer's private key tag. + */ + +extern const char *p_privtag(peer */*p*/); + /* --- @p_spec@ --- * * * Arguments: @peer *p@ = pointer to a peer block @@ -1199,7 +1393,7 @@ extern void p_destroy(peer */*p*/); #define FOREACH_PEER(p, stuff) do { \ peer_iter i_; \ peer *p; \ - for (p_mkiter(&i_); (p = p_next(&i_)) != 0; ) do stuff while (0); \ + for (p_mkiter(&i_); (p = p_next(&i_)) != 0; ) stuff \ } while (0) /* --- @p_mkiter@ --- *