mirror of
https://github.com/openssl/openssl.git
synced 2025-04-24 20:51:14 +08:00
QUIC APL: Introduce the QUIC_OBJ base type and infrastructure
Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Neil Horman <nhorman@openssl.org> (Merged from https://github.com/openssl/openssl/pull/23334)
This commit is contained in:
parent
e0ffd21e22
commit
1137f3f9ae
include/internal
ssl/quic
@ -79,6 +79,9 @@ void ossl_quic_engine_set_inhibit_tick(QUIC_ENGINE *qeng, int inhibit);
|
||||
/* Gets the reactor which can be used to tick/poll on the port. */
|
||||
QUIC_REACTOR *ossl_quic_engine_get0_reactor(QUIC_ENGINE *qeng);
|
||||
|
||||
OSSL_LIB_CTX *ossl_quic_engine_get0_libctx(QUIC_ENGINE *qeng);
|
||||
const char *ossl_quic_engine_get0_propq(QUIC_ENGINE *qeng);
|
||||
|
||||
# endif
|
||||
|
||||
#endif
|
||||
|
@ -36,6 +36,7 @@ typedef struct quic_srtm_st QUIC_SRTM;
|
||||
typedef struct quic_lcidm_st QUIC_LCIDM;
|
||||
typedef struct quic_urxe_st QUIC_URXE;
|
||||
typedef struct quic_engine_st QUIC_ENGINE;
|
||||
typedef struct quic_obj_st QUIC_OBJ;
|
||||
|
||||
# endif
|
||||
|
||||
|
@ -26,3 +26,4 @@ IF[{- !$disabled{quic} -}]
|
||||
SHARED_SOURCE[$LIBSSL]=../../crypto/getenv.c ../../crypto/ctype.c
|
||||
ENDIF
|
||||
ENDIF
|
||||
SOURCE[$LIBSSL]=quic_obj.c
|
||||
|
@ -87,6 +87,16 @@ void ossl_quic_engine_set_inhibit_tick(QUIC_ENGINE *qeng, int inhibit)
|
||||
qeng->inhibit_tick = (inhibit != 0);
|
||||
}
|
||||
|
||||
OSSL_LIB_CTX *ossl_quic_engine_get0_libctx(QUIC_ENGINE *qeng)
|
||||
{
|
||||
return qeng->libctx;
|
||||
}
|
||||
|
||||
const char *ossl_quic_engine_get0_propq(QUIC_ENGINE *qeng)
|
||||
{
|
||||
return qeng->propq;
|
||||
}
|
||||
|
||||
/*
|
||||
* QUIC Engine: Child Object Lifecycle Management
|
||||
* ==============================================
|
||||
|
@ -23,6 +23,7 @@
|
||||
# include "internal/quic_reactor.h"
|
||||
# include "internal/quic_thread_assist.h"
|
||||
# include "../ssl_local.h"
|
||||
# include "quic_obj_local.h"
|
||||
|
||||
# ifndef OPENSSL_NO_QUIC
|
||||
|
||||
|
98
ssl/quic/quic_obj.c
Normal file
98
ssl/quic/quic_obj.c
Normal file
@ -0,0 +1,98 @@
|
||||
/*
|
||||
* Copyright 2024 The OpenSSL Project Authors. All Rights Reserved.
|
||||
*
|
||||
* Licensed under the Apache License 2.0 (the "License"). You may not use
|
||||
* this file except in compliance with the License. You can obtain a copy
|
||||
* in the file LICENSE in the source distribution or at
|
||||
* https://www.openssl.org/source/license.html
|
||||
*/
|
||||
|
||||
#include "quic_obj_local.h"
|
||||
#include "quic_local.h"
|
||||
|
||||
static int obj_update_cache(QUIC_OBJ *obj);
|
||||
|
||||
int ossl_quic_obj_init(QUIC_OBJ *obj,
|
||||
SSL_CTX *ctx,
|
||||
int type,
|
||||
SSL *parent_obj,
|
||||
QUIC_ENGINE *engine,
|
||||
QUIC_PORT *port)
|
||||
{
|
||||
int is_event_leader = (engine != NULL);
|
||||
int is_port_leader = (port != NULL);
|
||||
|
||||
if (!ossl_assert(!obj->init_done && obj != NULL && SSL_TYPE_IS_QUIC(type)
|
||||
&& (parent_obj == NULL || IS_QUIC(parent_obj))))
|
||||
return 0;
|
||||
|
||||
/* Event leader is always the root object. */
|
||||
if (!ossl_assert(!is_event_leader || parent_obj == NULL))
|
||||
return 0;
|
||||
|
||||
if (!ossl_ssl_init(&obj->ssl, ctx, ctx->method, type))
|
||||
goto err;
|
||||
|
||||
obj->parent_obj = parent_obj;
|
||||
obj->is_event_leader = is_event_leader;
|
||||
obj->is_port_leader = is_port_leader;
|
||||
if (!obj_update_cache(obj))
|
||||
goto err;
|
||||
|
||||
obj->engine = engine;
|
||||
obj->port = port;
|
||||
obj->init_done = 1;
|
||||
return 1;
|
||||
|
||||
err:
|
||||
obj->is_event_leader = 0;
|
||||
obj->is_port_leader = 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static ossl_inline QUIC_OBJ *
|
||||
ssl_to_obj(SSL *ssl)
|
||||
{
|
||||
if (ssl == NULL)
|
||||
return NULL;
|
||||
|
||||
assert(IS_QUIC(ssl));
|
||||
return (QUIC_OBJ *)ssl;
|
||||
}
|
||||
|
||||
static int obj_update_cache(QUIC_OBJ *obj)
|
||||
{
|
||||
QUIC_OBJ *p;
|
||||
|
||||
for (p = obj; p != NULL && !p->is_event_leader;
|
||||
p = ssl_to_obj(p->parent_obj))
|
||||
if (!ossl_assert(p == obj || p->init_done))
|
||||
return 0;
|
||||
|
||||
if (!ossl_assert(p != NULL))
|
||||
return 0;
|
||||
|
||||
/*
|
||||
* Offset of ->ssl is guaranteed to be 0 but the NULL check makes ubsan
|
||||
* happy.
|
||||
*/
|
||||
obj->cached_event_leader = (p != NULL) ? &p->ssl : NULL;
|
||||
obj->engine = p->engine;
|
||||
|
||||
for (p = obj; p != NULL && !p->is_port_leader;
|
||||
p = ssl_to_obj(p->parent_obj));
|
||||
|
||||
obj->cached_port_leader = (p != NULL) ? &p->ssl : NULL;
|
||||
obj->port = (p != NULL) ? p->port : NULL;
|
||||
return 1;
|
||||
}
|
||||
|
||||
SSL_CONNECTION *ossl_quic_obj_get0_handshake_layer(QUIC_OBJ *obj)
|
||||
{
|
||||
assert(obj->init_done);
|
||||
|
||||
if (obj == NULL || obj->ssl.type != SSL_TYPE_QUIC_CONNECTION)
|
||||
return NULL;
|
||||
|
||||
return SSL_CONNECTION_FROM_SSL_ONLY(((QUIC_CONNECTION *)obj)->tls);
|
||||
}
|
274
ssl/quic/quic_obj_local.h
Normal file
274
ssl/quic/quic_obj_local.h
Normal file
@ -0,0 +1,274 @@
|
||||
/*
|
||||
* Copyright 2024 The OpenSSL Project Authors. All Rights Reserved.
|
||||
*
|
||||
* Licensed under the Apache License 2.0 (the "License"). You may not use
|
||||
* this file except in compliance with the License. You can obtain a copy
|
||||
* in the file LICENSE in the source distribution or at
|
||||
* https://www.openssl.org/source/license.html
|
||||
*/
|
||||
|
||||
#ifndef OSSL_QUIC_OBJ_LOCAL_H
|
||||
# define OSSL_QUIC_OBJ_LOCAL_H
|
||||
|
||||
# include <openssl/ssl.h>
|
||||
# include "internal/quic_predef.h"
|
||||
# include "internal/quic_engine.h"
|
||||
# include "../ssl_local.h"
|
||||
|
||||
# ifndef OPENSSL_NO_QUIC
|
||||
|
||||
/*
|
||||
* QUIC Object Structure.
|
||||
*
|
||||
* In the libssl APL, we have QLSOs, QCSOs and QSSOs, and in the future might
|
||||
* choose to introduce QDSOs. There are also roles such as Port Leader and Event
|
||||
* Leader which can be assumed by these different types under different
|
||||
* circumstances — in other words, whether an APL object is a Port or Event
|
||||
* Leader is not a static function of its type and these roles can 'float'
|
||||
* dynamically depending on the circumstances under which an APL object was
|
||||
* created.
|
||||
*
|
||||
* The QUIC_OBJ is a base type for QUIC APL objects which provides functionality
|
||||
* common to all QUIC objects and which supports having different APL objects
|
||||
* dynamically assume leader roles. It can therefore be seen as an extention of
|
||||
* the SSL base class and extends the SSL object for QUIC APL objects. This
|
||||
* avoids duplication of functionality for different types of QUIC object and
|
||||
* allows access to common responsibilities of different types of APL object
|
||||
* without regard to the kind of APL object we are dealing with.
|
||||
*
|
||||
* The "inheritance" hierarchy is as follows:
|
||||
*
|
||||
* SSL
|
||||
* SSL_CONNECTION
|
||||
* QUIC_OBJ
|
||||
* QUIC_DOMAIN (QDSO) -> QUIC_ENGINE *E
|
||||
* QUIC_LISTENER (QLSO) -> QUIC_PORT eP
|
||||
* QUIC_CONNECTION (QCSO) -> QUIC_CHANNEL epCs
|
||||
* QUIC_XSO (QSSO) -> QUIC_STREAM S
|
||||
*
|
||||
* Legend:
|
||||
*
|
||||
* *: Not currently modelled in the APL, though QUIC_ENGINE exists internally.
|
||||
*
|
||||
* E: Always an event leader if it exists.
|
||||
* e: Potentially an event leader (namely if it is the root APL object in a
|
||||
* hierarchy).
|
||||
*
|
||||
* P: Always a port leader if it exists.
|
||||
* p: Potentially a port leader (namely if there is no port leader above it).
|
||||
*
|
||||
* C: Always a connection leader.
|
||||
*
|
||||
* s: Potentially usable as a stream (if it has a default stream attached).
|
||||
* S: Always has the stream role if it exists.
|
||||
*
|
||||
* This structure must come at the start of a QUIC object structure definition.
|
||||
*
|
||||
* ssl->type still determines the actual object type. An SSL object pointer s
|
||||
* can be safely cast to (QUIC_OBJ *) iff IS_QUIC(s) is true.
|
||||
*/
|
||||
struct quic_obj_st {
|
||||
/* SSL object common header. */
|
||||
struct ssl_st ssl;
|
||||
|
||||
/*
|
||||
* Pointer to a parent APL object in a QUIC APL object hierarchy, or NULL if
|
||||
* this is the root object.
|
||||
*/
|
||||
SSL *parent_obj;
|
||||
|
||||
/* invariant: != NULL */
|
||||
SSL *cached_event_leader;
|
||||
/* invariant: != NULL iff this is a port leader or subsidiary object */
|
||||
SSL *cached_port_leader;
|
||||
|
||||
/*
|
||||
* Points to the QUIC_ENGINE instance. Always equals
|
||||
* cached_event_leader->engine. The containing_obj APL object owns this
|
||||
* instance iff is_event_leader is set, otherwise it is an additional
|
||||
* reference cached for convenience. Unlike port this is never NULL because
|
||||
* a QUIC domain is always rooted in an event leader.
|
||||
*/
|
||||
QUIC_ENGINE *engine;
|
||||
|
||||
/*
|
||||
* Points to the QUIC_PORT instance applicable to the containing_obj APL
|
||||
* object, or NULL if we are not at or below a port leader. Always equals
|
||||
* cached_port_leader->port. The containing_obj APL object owns this
|
||||
* instance iff is_port_leader is set, otherwise it is an additional
|
||||
* reference cached for convenience.
|
||||
*/
|
||||
QUIC_PORT *port;
|
||||
|
||||
unsigned int init_done : 1;
|
||||
unsigned int is_event_leader : 1;
|
||||
unsigned int is_port_leader : 1;
|
||||
};
|
||||
|
||||
/*
|
||||
* Initialises a QUIC_OBJ structure with zero or more roles active. Returns 1
|
||||
* on success or 0 on failure.
|
||||
*
|
||||
* ctx: A SSL_CTX used to initialise the SSL base object structure.
|
||||
*
|
||||
* type: A SSL_TYPE_* value designating the SSL object type.
|
||||
*
|
||||
* parent_obj: NULL if this is the root APL object in a new hierarchy, or a
|
||||
* pointer to the parent APL object otherwise.
|
||||
*
|
||||
* engine: If non-NULL, this object becomes the Event Leader. parent_obj must be
|
||||
* NULL iff this is non-NULL as currently the Event Leader is always the root in
|
||||
* an APL object hierarchy. If NULL, the contextually applicable engine is
|
||||
* determined by using parent_obj and ancestors to find the Event Leader.
|
||||
*
|
||||
* port: If non-NULL, this object becomes a Port Leader. If NULL, the
|
||||
* contextually applicable port (if any) is determined by using parent_obj and
|
||||
* ancestors to find the Port Leader.
|
||||
*/
|
||||
int ossl_quic_obj_init(QUIC_OBJ *obj,
|
||||
SSL_CTX *ctx,
|
||||
int type,
|
||||
SSL *parent_obj,
|
||||
QUIC_ENGINE *engine,
|
||||
QUIC_PORT *port);
|
||||
|
||||
/*
|
||||
* Returns a pointer to the handshake layer object which should be accessible on
|
||||
* obj for purposes of handshake API autoforwarding, if any.
|
||||
*
|
||||
* This returns NULL if a handshake layer SSL object is available but should not
|
||||
* be used for autoforwarding purposes, for example on a QSSO.
|
||||
*/
|
||||
SSL_CONNECTION *ossl_quic_obj_get0_handshake_layer(QUIC_OBJ *obj);
|
||||
|
||||
/*
|
||||
* Returns a pointer to the SSL base object structure. Returns NULL if obj is
|
||||
* NULL. If obj is non-NULL, it must be initialised.
|
||||
*/
|
||||
static ossl_inline ossl_unused SSL *
|
||||
ossl_quic_obj_get0_ssl(QUIC_OBJ *obj)
|
||||
{
|
||||
assert(obj->init_done);
|
||||
|
||||
/*
|
||||
* ->ssl is guaranteed to have an offset of 0 but the NULL check here makes
|
||||
* ubsan happy.
|
||||
*/
|
||||
return obj != NULL ? &obj->ssl : NULL;
|
||||
}
|
||||
|
||||
/*
|
||||
* Determines the applicable engine and return a pointer to it. Never returns
|
||||
* NULL.
|
||||
*/
|
||||
static ossl_inline ossl_unused QUIC_ENGINE *
|
||||
ossl_quic_obj_get0_engine(const QUIC_OBJ *obj)
|
||||
{
|
||||
assert(obj->init_done);
|
||||
return obj->engine;
|
||||
}
|
||||
|
||||
/* Determines the applicable port (if any) and returns a pointer to it. */
|
||||
static ossl_inline ossl_unused QUIC_PORT *
|
||||
ossl_quic_obj_get0_port(const QUIC_OBJ *obj)
|
||||
{
|
||||
assert(obj->init_done);
|
||||
return obj->port;
|
||||
}
|
||||
|
||||
/* Returns 1 iff this leader structure represents an event leader. */
|
||||
static ossl_inline ossl_unused int
|
||||
ossl_quic_obj_is_event_leader(const QUIC_OBJ *obj)
|
||||
{
|
||||
return obj->is_event_leader;
|
||||
}
|
||||
|
||||
/*
|
||||
* Similar to ossl_quic_obj_get0_engine, but only returns a non-NULL value if
|
||||
* the obj object itself is an event leader, rather than one of its ancestors.
|
||||
*/
|
||||
static ossl_inline ossl_unused QUIC_ENGINE *
|
||||
ossl_quic_obj_get0_engine_local(const QUIC_OBJ *obj)
|
||||
{
|
||||
return ossl_quic_obj_is_event_leader(obj)
|
||||
? ossl_quic_obj_get0_engine(obj) : NULL;
|
||||
}
|
||||
|
||||
/* Returns 1 iff this leader structure represents a port leader. */
|
||||
static ossl_inline ossl_unused int
|
||||
ossl_quic_obj_is_port_leader(const QUIC_OBJ *obj)
|
||||
{
|
||||
return obj->is_port_leader;
|
||||
}
|
||||
|
||||
/*
|
||||
* Similar to ossl_quic_obj_get0_port, but only returns a non-NULL value if
|
||||
* the obj object itself is a port leader, rather than one of its ancestors.
|
||||
*/
|
||||
static ossl_inline ossl_unused QUIC_PORT *
|
||||
ossl_quic_obj_get0_port_local(const QUIC_OBJ *obj)
|
||||
{
|
||||
return ossl_quic_obj_is_port_leader(obj)
|
||||
? ossl_quic_obj_get0_port(obj) : NULL;
|
||||
}
|
||||
|
||||
/*
|
||||
* Convenience Inlines
|
||||
* ===================
|
||||
*/
|
||||
|
||||
/* Get a pointer to the QUIC domain mutex. Always returns non-NULL. */
|
||||
static ossl_inline ossl_unused CRYPTO_MUTEX *
|
||||
ossl_quic_obj_get0_mutex(const QUIC_OBJ *obj)
|
||||
{
|
||||
return ossl_quic_engine_get0_mutex(ossl_quic_obj_get0_engine(obj));
|
||||
}
|
||||
|
||||
/*
|
||||
* Get a reference to the reactor applicable to a leader. Always returns
|
||||
* non-NULL.
|
||||
*/
|
||||
static ossl_inline ossl_unused QUIC_REACTOR *
|
||||
ossl_quic_obj_get0_reactor(const QUIC_OBJ *obj)
|
||||
{
|
||||
return ossl_quic_engine_get0_reactor(ossl_quic_obj_get0_engine(obj));
|
||||
}
|
||||
|
||||
/* Get a reference to the OSSL_LIB_CTX pointer applicable to a leader. */
|
||||
static ossl_inline ossl_unused OSSL_LIB_CTX *
|
||||
ossl_quic_obj_get0_libctx(const QUIC_OBJ *obj)
|
||||
{
|
||||
return ossl_quic_engine_get0_libctx(ossl_quic_obj_get0_engine(obj));
|
||||
}
|
||||
|
||||
/* Get a reference to the propq pointer applicable to a leader. */
|
||||
static ossl_inline ossl_unused const char *
|
||||
ossl_quic_obj_get0_propq(const QUIC_OBJ *obj)
|
||||
{
|
||||
return ossl_quic_engine_get0_propq(ossl_quic_obj_get0_engine(obj));
|
||||
}
|
||||
|
||||
/*
|
||||
* Returns the APL object pointer to the event leader in a hierarchy. Always
|
||||
* returns non-NULL.
|
||||
*/
|
||||
static ossl_inline ossl_unused SSL *
|
||||
ossl_quic_obj_get0_event_leader(const QUIC_OBJ *obj)
|
||||
{
|
||||
assert(obj->init_done);
|
||||
return obj->cached_event_leader;
|
||||
}
|
||||
|
||||
/*
|
||||
* Returns the APL object pointer to the port leader in a hierarchy (if any).
|
||||
* Always returns non-NULL.
|
||||
*/
|
||||
static ossl_inline ossl_unused SSL *
|
||||
ossl_quic_obj_get0_port_leader(const QUIC_OBJ *obj)
|
||||
{
|
||||
assert(obj->init_done);
|
||||
return obj->cached_port_leader;
|
||||
}
|
||||
|
||||
# endif
|
||||
#endif
|
Loading…
x
Reference in New Issue
Block a user