mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
61a3fff661
* ext/openssl/lib/openssl/ssl.rb (SSLSocket): Move the implementation of SSLSocket#initialize to C. Initialize the SSL (OpenSSL object) in it. Currently this is delayed until ossl_ssl_setup(), which is called from SSLSocket#accept or #connect. Say we call SSLSocket#hostname= with an illegal value. We expect an exception to be raised in #hostname= but actually we get it in the later SSLSocket#connect. Because the SSL is not ready at #hostname=, the actual call of SSL_set_tlsext_host_name() is also delayed. This also fixes: [ruby-dev:49376] [Bug #11724] * ext/openssl/ossl_ssl.c (ossl_ssl_initialize): Added. Almost the same as the Ruby version but this instantiate the SSL object at the same time. (ossl_ssl_setup): Adjust to the changes. Just set the underlying IO to the SSL. (ssl_started): Added. Make use of SSL_get_fd(). This returns -1 if not yet set by SSL_set_fd(). (ossl_ssl_data_get_struct): Removed. Now GetSSL() checks that the SSL exists. (ossl_ssl_set_session): Don't call ossl_ssl_setup() here as now the SSL is already instantiated in #initialize. (ossl_ssl_shutdown, ossl_start_ssl, ossl_ssl_read_internal, ossl_ssl_write_internal, ossl_ssl_stop, ossl_ssl_get_cert, ossl_ssl_get_peer_cert, ossl_ssl_get_peer_cert_chain, ossl_ssl_get_version, ossl_ssl_get_cipher, ossl_ssl_get_state, ossl_ssl_pending, ossl_ssl_session_reused, ossl_ssl_get_verify_result, ossl_ssl_get_client_ca_list, ossl_ssl_npn_protocol, ossl_ssl_alpn_protocol, ossl_ssl_tmp_key): Use GetSSL() instead of ossl_ssl_data_get_struct(). Use ssl_started(). (Init_ossl_ssl): Add method declarations of SSLSocket#{initialize, hostname=}. * ext/openssl/ossl_ssl.h (GetSSL): Check that the SSL is not NULL. It should not be NULL because we now set it in #initialize. * ext/openssl/ossl_ssl_session.c (ossl_ssl_session_initialize): No need to check if the SSL is NULL. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55191 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
321 lines
6.5 KiB
C
321 lines
6.5 KiB
C
/*
|
|
* Copyright (C) 2004-2007 Technorama Ltd. <oss-ruby@technorama.net>
|
|
*/
|
|
|
|
#include "ossl.h"
|
|
|
|
VALUE cSSLSession;
|
|
static VALUE eSSLSession;
|
|
|
|
static void
|
|
ossl_ssl_session_free(void *ptr)
|
|
{
|
|
SSL_SESSION_free(ptr);
|
|
}
|
|
|
|
const rb_data_type_t ossl_ssl_session_type = {
|
|
"OpenSSL/SSL/Session",
|
|
{
|
|
0, ossl_ssl_session_free,
|
|
},
|
|
0, 0, RUBY_TYPED_FREE_IMMEDIATELY,
|
|
};
|
|
|
|
static VALUE ossl_ssl_session_alloc(VALUE klass)
|
|
{
|
|
return TypedData_Wrap_Struct(klass, &ossl_ssl_session_type, NULL);
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* Session.new(SSLSocket | string) => session
|
|
*
|
|
* === Parameters
|
|
* +SSLSocket+ is an OpenSSL::SSL::SSLSocket
|
|
* +string+ must be a DER or PEM encoded Session.
|
|
*/
|
|
static VALUE ossl_ssl_session_initialize(VALUE self, VALUE arg1)
|
|
{
|
|
SSL_SESSION *ctx = NULL;
|
|
|
|
if (RDATA(self)->data)
|
|
ossl_raise(eSSLSession, "SSL Session already initialized");
|
|
|
|
if (rb_obj_is_instance_of(arg1, cSSLSocket)) {
|
|
SSL *ssl;
|
|
|
|
GetSSL(arg1, ssl);
|
|
|
|
if ((ctx = SSL_get1_session(ssl)) == NULL)
|
|
ossl_raise(eSSLSession, "no session available");
|
|
} else {
|
|
BIO *in = ossl_obj2bio(arg1);
|
|
|
|
ctx = PEM_read_bio_SSL_SESSION(in, NULL, NULL, NULL);
|
|
|
|
if (!ctx) {
|
|
OSSL_BIO_reset(in);
|
|
ctx = d2i_SSL_SESSION_bio(in, NULL);
|
|
}
|
|
|
|
BIO_free(in);
|
|
|
|
if (!ctx)
|
|
ossl_raise(rb_eArgError, "unknown type");
|
|
}
|
|
|
|
/* should not happen */
|
|
if (ctx == NULL)
|
|
ossl_raise(eSSLSession, "ctx not set - internal error");
|
|
|
|
RDATA(self)->data = ctx;
|
|
|
|
return self;
|
|
}
|
|
|
|
#if HAVE_SSL_SESSION_CMP == 0
|
|
int SSL_SESSION_cmp(const SSL_SESSION *a,const SSL_SESSION *b)
|
|
{
|
|
if (a->ssl_version != b->ssl_version ||
|
|
a->session_id_length != b->session_id_length)
|
|
return 1;
|
|
#if defined(_WIN32)
|
|
return memcmp(a->session_id, b->session_id, a->session_id_length);
|
|
#else
|
|
return CRYPTO_memcmp(a->session_id, b->session_id, a->session_id_length);
|
|
#endif
|
|
}
|
|
#endif
|
|
|
|
/*
|
|
* call-seq:
|
|
* session1 == session2 -> boolean
|
|
*
|
|
*/
|
|
static VALUE ossl_ssl_session_eq(VALUE val1, VALUE val2)
|
|
{
|
|
SSL_SESSION *ctx1, *ctx2;
|
|
|
|
GetSSLSession(val1, ctx1);
|
|
SafeGetSSLSession(val2, ctx2);
|
|
|
|
switch (SSL_SESSION_cmp(ctx1, ctx2)) {
|
|
case 0: return Qtrue;
|
|
default: return Qfalse;
|
|
}
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* session.time -> Time
|
|
*
|
|
* Gets start time of the session.
|
|
*
|
|
*/
|
|
static VALUE ossl_ssl_session_get_time(VALUE self)
|
|
{
|
|
SSL_SESSION *ctx;
|
|
time_t t;
|
|
|
|
GetSSLSession(self, ctx);
|
|
|
|
t = SSL_SESSION_get_time(ctx);
|
|
|
|
if (t == 0)
|
|
return Qnil;
|
|
|
|
return rb_funcall(rb_cTime, rb_intern("at"), 1, TIMET2NUM(t));
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* session.timeout -> integer
|
|
*
|
|
* Gets how long until the session expires in seconds.
|
|
*
|
|
*/
|
|
static VALUE ossl_ssl_session_get_timeout(VALUE self)
|
|
{
|
|
SSL_SESSION *ctx;
|
|
time_t t;
|
|
|
|
GetSSLSession(self, ctx);
|
|
|
|
t = SSL_SESSION_get_timeout(ctx);
|
|
|
|
return TIMET2NUM(t);
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* session.time=(Time) -> Time
|
|
* session.time=(integer) -> Time
|
|
*
|
|
* Sets start time of the session. Time resolution is in seconds.
|
|
*
|
|
*/
|
|
static VALUE ossl_ssl_session_set_time(VALUE self, VALUE time_v)
|
|
{
|
|
SSL_SESSION *ctx;
|
|
long t;
|
|
|
|
GetSSLSession(self, ctx);
|
|
if (rb_obj_is_instance_of(time_v, rb_cTime)) {
|
|
time_v = rb_funcall(time_v, rb_intern("to_i"), 0);
|
|
}
|
|
t = NUM2LONG(time_v);
|
|
SSL_SESSION_set_time(ctx, t);
|
|
return ossl_ssl_session_get_time(self);
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* session.timeout=(integer) -> integer
|
|
*
|
|
* Sets how long until the session expires in seconds.
|
|
*
|
|
*/
|
|
static VALUE ossl_ssl_session_set_timeout(VALUE self, VALUE time_v)
|
|
{
|
|
SSL_SESSION *ctx;
|
|
long t;
|
|
|
|
GetSSLSession(self, ctx);
|
|
t = NUM2LONG(time_v);
|
|
SSL_SESSION_set_timeout(ctx, t);
|
|
return ossl_ssl_session_get_timeout(self);
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* session.id -> aString
|
|
*
|
|
* Returns the Session ID.
|
|
*/
|
|
static VALUE ossl_ssl_session_get_id(VALUE self)
|
|
{
|
|
SSL_SESSION *ctx;
|
|
const unsigned char *p = NULL;
|
|
unsigned int i = 0;
|
|
|
|
GetSSLSession(self, ctx);
|
|
|
|
p = SSL_SESSION_get_id(ctx, &i);
|
|
|
|
return rb_str_new((const char *) p, i);
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* session.to_der -> aString
|
|
*
|
|
* Returns an ASN1 encoded String that contains the Session object.
|
|
*/
|
|
static VALUE ossl_ssl_session_to_der(VALUE self)
|
|
{
|
|
SSL_SESSION *ctx;
|
|
unsigned char *p;
|
|
int len;
|
|
VALUE str;
|
|
|
|
GetSSLSession(self, ctx);
|
|
len = i2d_SSL_SESSION(ctx, NULL);
|
|
if (len <= 0) {
|
|
ossl_raise(eSSLSession, "i2d_SSL_SESSION");
|
|
}
|
|
|
|
str = rb_str_new(0, len);
|
|
p = (unsigned char *)RSTRING_PTR(str);
|
|
i2d_SSL_SESSION(ctx, &p);
|
|
ossl_str_adjust(str, p);
|
|
return str;
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* session.to_pem -> String
|
|
*
|
|
* Returns a PEM encoded String that contains the Session object.
|
|
*/
|
|
static VALUE ossl_ssl_session_to_pem(VALUE self)
|
|
{
|
|
SSL_SESSION *ctx;
|
|
BIO *out;
|
|
BUF_MEM *buf;
|
|
VALUE str;
|
|
int i;
|
|
|
|
GetSSLSession(self, ctx);
|
|
|
|
if (!(out = BIO_new(BIO_s_mem()))) {
|
|
ossl_raise(eSSLSession, "BIO_s_mem()");
|
|
}
|
|
|
|
if (!(i=PEM_write_bio_SSL_SESSION(out, ctx))) {
|
|
BIO_free(out);
|
|
ossl_raise(eSSLSession, "SSL_SESSION_print()");
|
|
}
|
|
|
|
BIO_get_mem_ptr(out, &buf);
|
|
str = rb_str_new(buf->data, buf->length);
|
|
BIO_free(out);
|
|
|
|
return str;
|
|
}
|
|
|
|
|
|
/*
|
|
* call-seq:
|
|
* session.to_text -> String
|
|
*
|
|
* Shows everything in the Session object.
|
|
*/
|
|
static VALUE ossl_ssl_session_to_text(VALUE self)
|
|
{
|
|
SSL_SESSION *ctx;
|
|
BIO *out;
|
|
BUF_MEM *buf;
|
|
VALUE str;
|
|
|
|
GetSSLSession(self, ctx);
|
|
|
|
if (!(out = BIO_new(BIO_s_mem()))) {
|
|
ossl_raise(eSSLSession, "BIO_s_mem()");
|
|
}
|
|
|
|
if (!SSL_SESSION_print(out, ctx)) {
|
|
BIO_free(out);
|
|
ossl_raise(eSSLSession, "SSL_SESSION_print()");
|
|
}
|
|
|
|
BIO_get_mem_ptr(out, &buf);
|
|
str = rb_str_new(buf->data, buf->length);
|
|
BIO_free(out);
|
|
|
|
return str;
|
|
}
|
|
|
|
|
|
void Init_ossl_ssl_session(void)
|
|
{
|
|
#if 0
|
|
mOSSL = rb_define_module("OpenSSL"); /* let rdoc know about mOSSL */
|
|
mSSL = rb_define_module_under(mOSSL, "SSL");
|
|
#endif
|
|
cSSLSession = rb_define_class_under(mSSL, "Session", rb_cObject);
|
|
eSSLSession = rb_define_class_under(cSSLSession, "SessionError", eOSSLError);
|
|
|
|
rb_define_alloc_func(cSSLSession, ossl_ssl_session_alloc);
|
|
rb_define_method(cSSLSession, "initialize", ossl_ssl_session_initialize, 1);
|
|
|
|
rb_define_method(cSSLSession, "==", ossl_ssl_session_eq, 1);
|
|
|
|
rb_define_method(cSSLSession, "time", ossl_ssl_session_get_time, 0);
|
|
rb_define_method(cSSLSession, "time=", ossl_ssl_session_set_time, 1);
|
|
rb_define_method(cSSLSession, "timeout", ossl_ssl_session_get_timeout, 0);
|
|
rb_define_method(cSSLSession, "timeout=", ossl_ssl_session_set_timeout, 1);
|
|
rb_define_method(cSSLSession, "id", ossl_ssl_session_get_id, 0);
|
|
rb_define_method(cSSLSession, "to_der", ossl_ssl_session_to_der, 0);
|
|
rb_define_method(cSSLSession, "to_pem", ossl_ssl_session_to_pem, 0);
|
|
rb_define_method(cSSLSession, "to_text", ossl_ssl_session_to_text, 0);
|
|
}
|