mirror of
https://github.com/yrutschle/sslh.git
synced 2025-04-12 15:17:14 +03:00
fix tests so that fragmented tests actually work
This commit is contained in:
yrutschle
parent
4ae2e62d25
commit
7af31c45c9
372
sslh-conf.c
Normal file
372
sslh-conf.c
Normal file
@ -0,0 +1,372 @@
|
||||
/* Generated by conf2struct (https://www.rutschle.net/tech/conf2struct)
|
||||
* on Thu Nov 22 17:16:04 2018. */
|
||||
|
||||
|
||||
|
||||
#include <string.h>
|
||||
#include <libconfig.h>
|
||||
#include <stdlib.h>
|
||||
#include "sslh-conf.h"
|
||||
|
||||
static int config_protocols_parser(
|
||||
config_setting_t* cfg,
|
||||
struct config_protocols_items* config_protocols,
|
||||
const char** errmsg)
|
||||
{
|
||||
config_setting_t* setting;
|
||||
*errmsg = NULL;
|
||||
|
||||
if (config_setting_lookup(cfg, "name")) {
|
||||
if (config_setting_lookup_string(cfg, "name", &config_protocols->name) == CONFIG_FALSE) {
|
||||
*errmsg = "Parsing of option \"name\" failed";
|
||||
return 0;
|
||||
}
|
||||
} else {
|
||||
*errmsg = "Mandatory option \"name\" is missing";
|
||||
return 0;
|
||||
}
|
||||
if (config_setting_lookup(cfg, "host")) {
|
||||
if (config_setting_lookup_string(cfg, "host", &config_protocols->host) == CONFIG_FALSE) {
|
||||
*errmsg = "Parsing of option \"host\" failed";
|
||||
return 0;
|
||||
}
|
||||
} else {
|
||||
*errmsg = "Mandatory option \"host\" is missing";
|
||||
return 0;
|
||||
}
|
||||
if (config_setting_lookup(cfg, "port")) {
|
||||
if (config_setting_lookup_string(cfg, "port", &config_protocols->port) == CONFIG_FALSE) {
|
||||
*errmsg = "Parsing of option \"port\" failed";
|
||||
return 0;
|
||||
}
|
||||
} else {
|
||||
*errmsg = "Mandatory option \"port\" is missing";
|
||||
return 0;
|
||||
}
|
||||
config_protocols->service = NULL;
|
||||
if (config_setting_lookup(cfg, "service")) {
|
||||
if (config_setting_lookup_string(cfg, "service", &config_protocols->service) == CONFIG_FALSE) {
|
||||
*errmsg = "Parsing of option service failed";
|
||||
return 0;
|
||||
} else {
|
||||
config_protocols->service_is_present = 1;
|
||||
}
|
||||
;
|
||||
}
|
||||
config_protocols->fork = 0;
|
||||
if (config_setting_lookup(cfg, "fork")) {
|
||||
if (config_setting_lookup_bool(cfg, "fork", &config_protocols->fork) == CONFIG_FALSE) {
|
||||
*errmsg = "Parsing of option fork failed";
|
||||
return 0;
|
||||
} ;
|
||||
}
|
||||
config_protocols->log_level = 1;
|
||||
if (config_setting_lookup(cfg, "log_level")) {
|
||||
if (config_setting_lookup_int(cfg, "log_level", &config_protocols->log_level) == CONFIG_FALSE) {
|
||||
*errmsg = "Parsing of option log_level failed";
|
||||
return 0;
|
||||
} ;
|
||||
}
|
||||
config_protocols->keepalive = 0;
|
||||
if (config_setting_lookup(cfg, "keepalive")) {
|
||||
if (config_setting_lookup_bool(cfg, "keepalive", &config_protocols->keepalive) == CONFIG_FALSE) {
|
||||
*errmsg = "Parsing of option keepalive failed";
|
||||
return 0;
|
||||
} ;
|
||||
}
|
||||
config_protocols->sni_hostnames = NULL;
|
||||
config_protocols->sni_hostnames_len = 0;
|
||||
if ((setting = config_setting_lookup(cfg, "sni_hostnames"))) {
|
||||
int len = config_setting_length(setting);
|
||||
config_protocols->sni_hostnames = malloc(len * sizeof(*config_protocols->sni_hostnames));
|
||||
config_protocols->sni_hostnames_len = len;
|
||||
for (int i = 0; i < len; i++) {
|
||||
config_setting_t* s = config_setting_get_elem(setting, i);
|
||||
config_protocols->sni_hostnames[i] = config_setting_get_string(s);
|
||||
}
|
||||
}
|
||||
config_protocols->alpn_protocols = NULL;
|
||||
config_protocols->alpn_protocols_len = 0;
|
||||
if ((setting = config_setting_lookup(cfg, "alpn_protocols"))) {
|
||||
int len = config_setting_length(setting);
|
||||
config_protocols->alpn_protocols = malloc(len * sizeof(*config_protocols->alpn_protocols));
|
||||
config_protocols->alpn_protocols_len = len;
|
||||
for (int i = 0; i < len; i++) {
|
||||
config_setting_t* s = config_setting_get_elem(setting, i);
|
||||
config_protocols->alpn_protocols[i] = config_setting_get_string(s);
|
||||
}
|
||||
}
|
||||
config_protocols->regex_patterns = NULL;
|
||||
config_protocols->regex_patterns_len = 0;
|
||||
if ((setting = config_setting_lookup(cfg, "regex_patterns"))) {
|
||||
int len = config_setting_length(setting);
|
||||
config_protocols->regex_patterns = malloc(len * sizeof(*config_protocols->regex_patterns));
|
||||
config_protocols->regex_patterns_len = len;
|
||||
for (int i = 0; i < len; i++) {
|
||||
config_setting_t* s = config_setting_get_elem(setting, i);
|
||||
config_protocols->regex_patterns[i] = config_setting_get_string(s);
|
||||
}
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
static int config_listen_parser(
|
||||
config_setting_t* cfg,
|
||||
struct config_listen_items* config_listen,
|
||||
const char** errmsg)
|
||||
{
|
||||
config_setting_t* setting;
|
||||
*errmsg = NULL;
|
||||
|
||||
if (config_setting_lookup(cfg, "host")) {
|
||||
if (config_setting_lookup_string(cfg, "host", &config_listen->host) == CONFIG_FALSE) {
|
||||
*errmsg = "Parsing of option \"host\" failed";
|
||||
return 0;
|
||||
}
|
||||
} else {
|
||||
*errmsg = "Mandatory option \"host\" is missing";
|
||||
return 0;
|
||||
}
|
||||
if (config_setting_lookup(cfg, "port")) {
|
||||
if (config_setting_lookup_string(cfg, "port", &config_listen->port) == CONFIG_FALSE) {
|
||||
*errmsg = "Parsing of option \"port\" failed";
|
||||
return 0;
|
||||
}
|
||||
} else {
|
||||
*errmsg = "Mandatory option \"port\" is missing";
|
||||
return 0;
|
||||
}
|
||||
config_listen->keepalive = 0;
|
||||
if (config_setting_lookup(cfg, "keepalive")) {
|
||||
if (config_setting_lookup_bool(cfg, "keepalive", &config_listen->keepalive) == CONFIG_FALSE) {
|
||||
*errmsg = "Parsing of option keepalive failed";
|
||||
return 0;
|
||||
} ;
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
int config_parser(
|
||||
config_setting_t* cfg,
|
||||
struct config_items* config,
|
||||
const char** errmsg)
|
||||
{
|
||||
config_setting_t* setting;
|
||||
*errmsg = NULL;
|
||||
|
||||
config->verbose = 0;
|
||||
if (config_setting_lookup(cfg, "verbose")) {
|
||||
if (config_setting_lookup_bool(cfg, "verbose", &config->verbose) == CONFIG_FALSE) {
|
||||
*errmsg = "Parsing of option verbose failed";
|
||||
return 0;
|
||||
} ;
|
||||
}
|
||||
config->foreground = 0;
|
||||
if (config_setting_lookup(cfg, "foreground")) {
|
||||
if (config_setting_lookup_bool(cfg, "foreground", &config->foreground) == CONFIG_FALSE) {
|
||||
*errmsg = "Parsing of option foreground failed";
|
||||
return 0;
|
||||
} ;
|
||||
}
|
||||
config->inetd = 0;
|
||||
if (config_setting_lookup(cfg, "inetd")) {
|
||||
if (config_setting_lookup_bool(cfg, "inetd", &config->inetd) == CONFIG_FALSE) {
|
||||
*errmsg = "Parsing of option inetd failed";
|
||||
return 0;
|
||||
} ;
|
||||
}
|
||||
config->numeric = 0;
|
||||
if (config_setting_lookup(cfg, "numeric")) {
|
||||
if (config_setting_lookup_bool(cfg, "numeric", &config->numeric) == CONFIG_FALSE) {
|
||||
*errmsg = "Parsing of option numeric failed";
|
||||
return 0;
|
||||
} ;
|
||||
}
|
||||
config->transparent = 0;
|
||||
if (config_setting_lookup(cfg, "transparent")) {
|
||||
if (config_setting_lookup_bool(cfg, "transparent", &config->transparent) == CONFIG_FALSE) {
|
||||
*errmsg = "Parsing of option transparent failed";
|
||||
return 0;
|
||||
} ;
|
||||
}
|
||||
config->timeout = 2;
|
||||
if (config_setting_lookup(cfg, "timeout")) {
|
||||
if (config_setting_lookup_int(cfg, "timeout", &config->timeout) == CONFIG_FALSE) {
|
||||
*errmsg = "Parsing of option timeout failed";
|
||||
return 0;
|
||||
} ;
|
||||
}
|
||||
config->user = NULL;
|
||||
if (config_setting_lookup(cfg, "user")) {
|
||||
if (config_setting_lookup_string(cfg, "user", &config->user) == CONFIG_FALSE) {
|
||||
*errmsg = "Parsing of option user failed";
|
||||
return 0;
|
||||
} else {
|
||||
config->user_is_present = 1;
|
||||
}
|
||||
;
|
||||
}
|
||||
config->pidfile = NULL;
|
||||
if (config_setting_lookup(cfg, "pidfile")) {
|
||||
if (config_setting_lookup_string(cfg, "pidfile", &config->pidfile) == CONFIG_FALSE) {
|
||||
*errmsg = "Parsing of option pidfile failed";
|
||||
return 0;
|
||||
} else {
|
||||
config->pidfile_is_present = 1;
|
||||
}
|
||||
;
|
||||
}
|
||||
if (config_setting_lookup(cfg, "chroot")) {
|
||||
if (config_setting_lookup_string(cfg, "chroot", &config->chroot) == CONFIG_FALSE) {
|
||||
*errmsg = "Parsing of option \"chroot\" failed";
|
||||
return 0;
|
||||
}
|
||||
} else {
|
||||
*errmsg = "Mandatory option \"chroot\" is missing";
|
||||
return 0;
|
||||
}
|
||||
config->syslog_facility = "auth";
|
||||
if (config_setting_lookup(cfg, "syslog_facility")) {
|
||||
if (config_setting_lookup_string(cfg, "syslog_facility", &config->syslog_facility) == CONFIG_FALSE) {
|
||||
*errmsg = "Parsing of option syslog_facility failed";
|
||||
return 0;
|
||||
} ;
|
||||
}
|
||||
config->on_timeout = "ssh";
|
||||
if (config_setting_lookup(cfg, "on_timeout")) {
|
||||
if (config_setting_lookup_string(cfg, "on_timeout", &config->on_timeout) == CONFIG_FALSE) {
|
||||
*errmsg = "Parsing of option on_timeout failed";
|
||||
return 0;
|
||||
} ;
|
||||
}
|
||||
|
||||
config->listen = NULL;
|
||||
config->listen_len = 0;
|
||||
if ((setting = config_setting_lookup(cfg, "listen"))) {
|
||||
int len = config_setting_length(setting);
|
||||
config->listen = malloc(len * sizeof(*config->listen));
|
||||
config->listen_len = len;
|
||||
for (int i = 0; i < len; i++) {
|
||||
config_setting_t* s = config_setting_get_elem(setting, i);
|
||||
int res = config_listen_parser(s, &config->listen[i], errmsg);
|
||||
if (!res) return 0;
|
||||
}
|
||||
}
|
||||
|
||||
config->protocols = NULL;
|
||||
config->protocols_len = 0;
|
||||
if ((setting = config_setting_lookup(cfg, "protocols"))) {
|
||||
int len = config_setting_length(setting);
|
||||
config->protocols = malloc(len * sizeof(*config->protocols));
|
||||
config->protocols_len = len;
|
||||
for (int i = 0; i < len; i++) {
|
||||
config_setting_t* s = config_setting_get_elem(setting, i);
|
||||
int res = config_protocols_parser(s, &config->protocols[i], errmsg);
|
||||
if (!res) return 0;
|
||||
}
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
static void indent(int depth)
|
||||
{
|
||||
int i;
|
||||
for (i = 0; i < depth; i++)
|
||||
printf(" ");
|
||||
}
|
||||
|
||||
static void config_protocols_print(
|
||||
struct config_protocols_items* config_protocols,
|
||||
int depth)
|
||||
{
|
||||
int i;
|
||||
indent(depth);
|
||||
printf("name: %s\n", config_protocols->name);
|
||||
indent(depth);
|
||||
printf("host: %s\n", config_protocols->host);
|
||||
indent(depth);
|
||||
printf("port: %s\n", config_protocols->port);
|
||||
indent(depth);
|
||||
printf("service: %s\n", config_protocols->service);
|
||||
indent(depth);
|
||||
printf("fork: %d\n", config_protocols->fork);
|
||||
indent(depth);
|
||||
printf("log_level: %d\n", config_protocols->log_level);
|
||||
indent(depth);
|
||||
printf("keepalive: %d\n", config_protocols->keepalive);
|
||||
indent(depth);
|
||||
printf("sni_hostnames [%d]:\n", config_protocols->sni_hostnames_len);
|
||||
for (i = 0; i < config_protocols->sni_hostnames_len; i++) {
|
||||
indent(depth+1);
|
||||
printf("%d:\t%s\n", i, config_protocols->sni_hostnames[i]);
|
||||
}
|
||||
indent(depth);
|
||||
printf("alpn_protocols [%d]:\n", config_protocols->alpn_protocols_len);
|
||||
for (i = 0; i < config_protocols->alpn_protocols_len; i++) {
|
||||
indent(depth+1);
|
||||
printf("%d:\t%s\n", i, config_protocols->alpn_protocols[i]);
|
||||
}
|
||||
indent(depth);
|
||||
printf("regex_patterns [%d]:\n", config_protocols->regex_patterns_len);
|
||||
for (i = 0; i < config_protocols->regex_patterns_len; i++) {
|
||||
indent(depth+1);
|
||||
printf("%d:\t%s\n", i, config_protocols->regex_patterns[i]);
|
||||
}
|
||||
printf("\n");
|
||||
}
|
||||
|
||||
static void config_listen_print(
|
||||
struct config_listen_items* config_listen,
|
||||
int depth)
|
||||
{
|
||||
int i;
|
||||
indent(depth);
|
||||
printf("host: %s\n", config_listen->host);
|
||||
indent(depth);
|
||||
printf("port: %s\n", config_listen->port);
|
||||
indent(depth);
|
||||
printf("keepalive: %d\n", config_listen->keepalive);
|
||||
printf("\n");
|
||||
}
|
||||
|
||||
void config_print(
|
||||
struct config_items* config,
|
||||
int depth)
|
||||
{
|
||||
int i;
|
||||
indent(depth);
|
||||
printf("verbose: %d\n", config->verbose);
|
||||
indent(depth);
|
||||
printf("foreground: %d\n", config->foreground);
|
||||
indent(depth);
|
||||
printf("inetd: %d\n", config->inetd);
|
||||
indent(depth);
|
||||
printf("numeric: %d\n", config->numeric);
|
||||
indent(depth);
|
||||
printf("transparent: %d\n", config->transparent);
|
||||
indent(depth);
|
||||
printf("timeout: %d\n", config->timeout);
|
||||
indent(depth);
|
||||
printf("user: %s\n", config->user);
|
||||
indent(depth);
|
||||
printf("pidfile: %s\n", config->pidfile);
|
||||
indent(depth);
|
||||
printf("chroot: %s\n", config->chroot);
|
||||
indent(depth);
|
||||
printf("syslog_facility: %s\n", config->syslog_facility);
|
||||
indent(depth);
|
||||
printf("on_timeout: %s\n", config->on_timeout);
|
||||
|
||||
indent(depth);
|
||||
printf("listen [%d]:\n", config->listen_len);
|
||||
for (int i = 0; i < config->listen_len; i++) {
|
||||
config_listen_print(&config->listen[i], depth+1);
|
||||
}
|
||||
|
||||
indent(depth);
|
||||
printf("protocols [%d]:\n", config->protocols_len);
|
||||
for (int i = 0; i < config->protocols_len; i++) {
|
||||
config_protocols_print(&config->protocols[i], depth+1);
|
||||
}
|
||||
printf("\n");
|
||||
}
|
||||
56
sslh-conf.h
Normal file
56
sslh-conf.h
Normal file
@ -0,0 +1,56 @@
|
||||
/* Generated by conf2struct (https://www.rutschle.net/tech/conf2struct)
|
||||
* on Thu Nov 22 17:16:04 2018. */
|
||||
|
||||
struct config_protocols_items {
|
||||
const char* name;
|
||||
const char* host;
|
||||
const char* port;
|
||||
int service_is_present;
|
||||
const char* service;
|
||||
int fork;
|
||||
int log_level;
|
||||
int keepalive;
|
||||
int sni_hostnames_len;
|
||||
const char** sni_hostnames;
|
||||
int alpn_protocols_len;
|
||||
const char** alpn_protocols;
|
||||
int regex_patterns_len;
|
||||
const char** regex_patterns;
|
||||
};
|
||||
|
||||
|
||||
struct config_listen_items {
|
||||
const char* host;
|
||||
const char* port;
|
||||
int keepalive;
|
||||
};
|
||||
|
||||
|
||||
struct config_items {
|
||||
int verbose;
|
||||
int foreground;
|
||||
int inetd;
|
||||
int numeric;
|
||||
int transparent;
|
||||
int timeout;
|
||||
int user_is_present;
|
||||
const char* user;
|
||||
int pidfile_is_present;
|
||||
const char* pidfile;
|
||||
const char* chroot;
|
||||
const char* syslog_facility;
|
||||
const char* on_timeout;
|
||||
int listen_len;
|
||||
struct config_listen_items* listen;
|
||||
int protocols_len;
|
||||
struct config_protocols_items* protocols;
|
||||
};
|
||||
|
||||
int config_parser(
|
||||
config_setting_t* cfg,
|
||||
struct config_items* config,
|
||||
const char** errmsg);
|
||||
|
||||
void config_print(
|
||||
struct config_items *config,
|
||||
int depth);
|
||||
52
sslhconf.cfg
Normal file
52
sslhconf.cfg
Normal file
@ -0,0 +1,52 @@
|
||||
header: "sslh-conf.h";
|
||||
parser: "sslh-conf.c";
|
||||
|
||||
config: (
|
||||
{ name: "verbose"; type: "boolean"; default: false },
|
||||
{ name: "foreground"; type: "boolean"; default: false; },
|
||||
{ name: "inetd"; type: "boolean"; default: false; },
|
||||
{ name: "numeric"; type: "boolean"; default: false; },
|
||||
{ name: "transparent"; type: "boolean"; default: false; },
|
||||
{ name: "timeout"; type: "int"; default: 2; },
|
||||
{ name: "user"; type: "string"; optional: true; },
|
||||
{ name: "pidfile"; type: "string"; optional: true; },
|
||||
{ name: "chroot"; type: "string"; },
|
||||
{ name: "syslog_facility"; type: "string"; default: "auth"; },
|
||||
|
||||
{name: "on_timeout"; type: "string"; default: "ssh"; },
|
||||
|
||||
{ name: "listen",
|
||||
type: "list",
|
||||
items: (
|
||||
{ name: "host"; type: "string"; },
|
||||
{ name: "port"; type: "string"; },
|
||||
{ name: "keepalive"; type: "boolean"; default: false; }
|
||||
)
|
||||
},
|
||||
|
||||
{ name: "protocols",
|
||||
type: "list",
|
||||
items: (
|
||||
{ name: "name"; type: "string"; },
|
||||
{ name: "host"; type: "string"; },
|
||||
{ name: "port"; type: "string"; },
|
||||
{ name: "service"; type: "string"; optional: true; },
|
||||
{ name: "fork"; type: "boolean"; default: false },
|
||||
{ name: "log_level"; type: "int"; default: 1 },
|
||||
{ name: "keepalive"; type: "boolean"; default: false },
|
||||
{ name: "sni_hostnames",
|
||||
type: "array",
|
||||
element_type: "string"
|
||||
},
|
||||
{ name: "alpn_protocols",
|
||||
type: "array",
|
||||
element_type: "string"
|
||||
},
|
||||
{ name: "regex_patterns",
|
||||
type: "array",
|
||||
element_type: "string"
|
||||
}
|
||||
)
|
||||
}
|
||||
)
|
||||
|
||||
7
t
7
t
@ -90,7 +90,7 @@ sub test_probe {
|
||||
$data =~ /^(.*?): /;
|
||||
my $prefix = $1;
|
||||
$data =~ s/$prefix: //g;
|
||||
print "Received: protocol $prefix data [$data]\n";
|
||||
print "Received $n bytes: protocol $prefix data [$data]\n";
|
||||
close $cnx;
|
||||
|
||||
$opts{expected} =~ s/^ssl/tls/; # to remove in 1.21
|
||||
@ -104,7 +104,7 @@ sub test_probe {
|
||||
# available per-protocol as some probes don't support
|
||||
# fragmentation)
|
||||
sub test_probes {
|
||||
my (%opts) = @_;
|
||||
my (%in_opts) = @_;
|
||||
|
||||
my @probes = @{$conf->fetch_array("protocols")};
|
||||
foreach my $p (@probes) {
|
||||
@ -136,6 +136,7 @@ sub test_probes {
|
||||
|
||||
my $pattern = $protocols{$p->{name}}->{data};
|
||||
|
||||
my %opts = %in_opts;
|
||||
$opts{no_frag} = 1 if $protocols{$p->{name}}->{no_frag};
|
||||
|
||||
if ($p->{sni_hostnames} or $p->{alpn_protocols}) {
|
||||
@ -214,7 +215,7 @@ for my $binary (@binaries) {
|
||||
my $cnx_h = new IO::Socket::INET(PeerHost => "localhost:$sslh_port");
|
||||
warn "$!\n" unless $cnx_h;
|
||||
if (defined $cnx_h) {
|
||||
sleep 3;
|
||||
sleep 13;
|
||||
print $cnx_h $test_data;
|
||||
my $data = <$cnx_h>;
|
||||
is($data, "ssh: $test_data", "Shy SSH connection");
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user