[ViewVC] Diff of: svn/ircd-hybrid/trunk/src/conf

Comparing ircd-hybrid/trunk/src/conf_parser.y (file contents):
Revision 1736 by michael, Sun Jan 13 09:31:46 2013 UTC vs.
Revision 1851 by michael, Wed Apr 24 18:31:06 2013 UTC

+#include "log.h"
+#include "client.h"     /* for UMODE_ALL only */
+#include "irc_string.h"
-–
+#include "sprintf_irc.h"
+#include "memory.h"
+#include "modules.h"
+#include "s_serv.h"
+#include <openssl/dh.h>
+#endif
-+
+#include "rsa.h"
-+
+int yylex(void);
+static struct
+    ping_freq,
+    max_perip,
+    con_freq,
-+
+    min_idle,
-+
+    max_idle,
+    max_total,
+    max_global,
+    max_local,
+%token  HIDDEN_NAME
+%token  HIDE_SERVER_IPS
+%token  HIDE_SERVERS
-+
+%token  HIDE_SERVICES
+%token  HIDE_SPOOF_IPS
+%token  HOST
+%token  HUB
+%token  MAX_IDENT
+%token  MAX_LOCAL
+%token  MAX_NICK_CHANGES
-+
+%token  MAX_NICK_LENGTH
+%token  MAX_NICK_TIME
+%token  MAX_NUMBER
+%token  MAX_TARGETS
-+
+%token  MAX_TOPIC_LENGTH
+%token  MAX_WATCH
-–
+%token  MESSAGE_LOCALE
+%token  MIN_NONWILDCARD
+%token  MIN_NONWILDCARD_SIMPLE
-+
+%token  MIN_IDLE
-+
+%token  MAX_IDLE
-+
+%token  RANDOM_IDLE
-+
+%token  HIDE_IDLE_FROM_OPERS
+%token  MODULE
+%token  MODULES
+%token  NAME
+%token  T_TLSV1
+%token  RESV
+%token  RESV_EXEMPT
-<
+%token  SECONDS MINUTES HOURS DAYS WEEKS
->
+%token  SECONDS MINUTES HOURS DAYS WEEKS MONTHS YEARS
+%token  SENDQ
+%token  SEND_PASSWORD
+%token  SERVERHIDE
+                        $$ = $1 * 60 * 60 * 24 * 7 + $3;
-+
+                | NUMBER MONTHS timespec_
-+
+                {
-+
+                        $$ = $1 * 60 * 60 * 24 * 7 * 4 + $3;
-+
+                }
-+
+                | NUMBER YEARS timespec_
-+
+                {
-+
+                        $$ = $1 * 60 * 60 * 24 * 365 + $3;
-+
+                }
+sizespec_:      { $$ = 0; } | sizespec;
+serverinfo_item:        serverinfo_name | serverinfo_vhost |
+                        serverinfo_hub | serverinfo_description |
+                        serverinfo_network_name | serverinfo_network_desc |
-<
+                        serverinfo_max_clients | serverinfo_ssl_dh_param_file |
->
+                        serverinfo_max_clients | serverinfo_max_nick_length |
->
+                        serverinfo_max_topic_length | serverinfo_ssl_dh_param_file |
+                        serverinfo_rsa_private_key_file | serverinfo_vhost6 |
+                        serverinfo_sid | serverinfo_ssl_certificate_file |
+                        serverinfo_ssl_client_method | serverinfo_ssl_server_method |
+    if (!ServerInfo.rsa_private_key_file)
-<
+      yyerror("No rsa_private_key_file specified, SSL disabled");
->
+      conf_error_report("No rsa_private_key_file specified, SSL disabled");
+      break;
+        SSL_CTX_use_certificate_file(ServerInfo.client_ctx, yylval.string,
+                                     SSL_FILETYPE_PEM) <= 0)
-<
+      yyerror(ERR_lib_error_string(ERR_get_error()));
->
+      report_crypto_errors();
->
+      conf_error_report("Could not open/read certificate file");
+      break;
+        SSL_CTX_use_PrivateKey_file(ServerInfo.client_ctx, ServerInfo.rsa_private_key_file,
+                                    SSL_FILETYPE_PEM) <= 0)
-<
+      yyerror(ERR_lib_error_string(ERR_get_error()));
->
+      report_crypto_errors();
->
+      conf_error_report("Could not read RSA private key");
+      break;
+    if (!SSL_CTX_check_private_key(ServerInfo.server_ctx) ||
+        !SSL_CTX_check_private_key(ServerInfo.client_ctx))
-<
+      yyerror(ERR_lib_error_string(ERR_get_error()));
->
+      report_crypto_errors();
->
+      conf_error_report("Could not read RSA private key");
+      break;
+    if ((file = BIO_new_file(yylval.string, "r")) == NULL)
-<
+      yyerror("File open failed, ignoring");
->
+      conf_error_report("File open failed, ignoring");
+      break;
+    if (ServerInfo.rsa_private_key == NULL)
-<
+      yyerror("Couldn't extract key, ignoring");
->
+      conf_error_report("Couldn't extract key, ignoring");
+      break;
+      RSA_free(ServerInfo.rsa_private_key);
+      ServerInfo.rsa_private_key = NULL;
-<
+      yyerror("Invalid key, ignoring");
->
+      conf_error_report("Invalid key, ignoring");
+      break;
+      RSA_free(ServerInfo.rsa_private_key);
+      ServerInfo.rsa_private_key = NULL;
-<
+      yyerror("Not a 2048 bit key, ignoring");
->
+      conf_error_report("Not a 2048 bit key, ignoring");
+#endif
+      if (dh)
+        if (DH_size(dh) < 128)
-<
+          ilog(LOG_TYPE_IRCD, "Ignoring serverinfo::ssl_dh_param_file -- need at least a 1024 bit DH prime size");
->
+          conf_error_report("Ignoring serverinfo::ssl_dh_param_file -- need at least a 1024 bit DH prime size");
+        else
+          SSL_CTX_set_tmp_dh(ServerInfo.server_ctx, dh);
+      ServerInfo.name = xstrdup(yylval.string);
+    else
-<
+      ilog(LOG_TYPE_IRCD, "Ignoring serverinfo::name -- invalid name. Aborting.");
->
+      conf_error_report("Ignoring serverinfo::name -- invalid name. Aborting.");
+      exit(0);
+      ServerInfo.sid = xstrdup(yylval.string);
+    else
-<
+      ilog(LOG_TYPE_IRCD, "Ignoring serverinfo::sid -- invalid SID. Aborting.");
->
+      conf_error_report("Ignoring serverinfo::sid -- invalid SID. Aborting.");
+      exit(0);
+    char buf[IRCD_BUFSIZE];
+    snprintf(buf, sizeof(buf), "MAXCLIENTS too low, setting to %d", MAXCLIENTS_MIN);
-<
+    yyerror(buf);
->
+    conf_error_report(buf);
+    ServerInfo.max_clients = MAXCLIENTS_MIN;
+  else if ($3 > MAXCLIENTS_MAX)
+    char buf[IRCD_BUFSIZE];
+    snprintf(buf, sizeof(buf), "MAXCLIENTS too high, setting to %d", MAXCLIENTS_MAX);
-<
+    yyerror(buf);
->
+    conf_error_report(buf);
+    ServerInfo.max_clients = MAXCLIENTS_MAX;
+  else
+    ServerInfo.max_clients = $3;
+};
-+
+serverinfo_max_nick_length: MAX_NICK_LENGTH '=' NUMBER ';'
-+
+{
-+
+  if (conf_parser_ctx.pass != 2)
-+
+    break;
-+
-+
+  if ($3 < 9)
-+
+  {
-+
+    conf_error_report("max_nick_length too low, setting to 9");
-+
+    ServerInfo.max_nick_length = 9;
-+
+  }
-+
+  else if ($3 > NICKLEN)
-+
+  {
-+
+    char buf[IRCD_BUFSIZE];
-+
-+
+    snprintf(buf, sizeof(buf), "max_nick_length too high, setting to %d", NICKLEN);
-+
+    conf_error_report(buf);
-+
+    ServerInfo.max_nick_length = NICKLEN;
-+
+  }
-+
+  else
-+
+    ServerInfo.max_nick_length = $3;
-+
+};
-+
-+
+serverinfo_max_topic_length: MAX_TOPIC_LENGTH '=' NUMBER ';'
-+
+{
-+
+  if (conf_parser_ctx.pass != 2)
-+
+    break;
-+
-+
+  if ($3 < 80)
-+
+  {
-+
+    conf_error_report("max_topic_length too low, setting to 80");
-+
+    ServerInfo.max_topic_length = 80;
-+
+  }
-+
+  else if ($3 > TOPICLEN)
-+
+  {
-+
+    char buf[IRCD_BUFSIZE];
-+
-+
+    snprintf(buf, sizeof(buf), "max_topic_length too high, setting to %d", TOPICLEN);
-+
+    conf_error_report(buf);
-+
+    ServerInfo.max_topic_length = TOPICLEN;
-+
+  }
-+
+  else
-+
+    ServerInfo.max_topic_length = $3;
-+
+};
-+
+serverinfo_hub: HUB '=' TBOOL ';'
+  if (conf_parser_ctx.pass == 2)
+    break;
+  if (block_state.type.value && block_state.file.buf[0])
-<
+    log_add_file(block_state.type.value, block_state.size.value,
->
+    log_set_file(block_state.type.value, block_state.size.value,
+                 block_state.file.buf);
+};
+      if ((file = BIO_new_file(block_state.file.buf, "r")) == NULL)
-<
+        yyerror("Ignoring rsa_public_key_file -- file doesn't exist");
->
+        conf_error_report("Ignoring rsa_public_key_file -- file doesn't exist");
+        break;
+      if ((pkey = PEM_read_bio_RSA_PUBKEY(file, NULL, 0, NULL)) == NULL)
-<
+      {
-<
+        yyerror("Ignoring rsa_public_key_file -- Key invalid; check key syntax.");
-<
+        break;
-<
+      }
->
+        conf_error_report("Ignoring rsa_public_key_file -- Key invalid; check key syntax.");
+      conf->rsa_public_key = pkey;
+      BIO_set_close(file, BIO_CLOSE);
+  block_state.max_total.value = MAXIMUM_LINKS_DEFAULT;
+  block_state.max_sendq.value = DEFAULT_SENDQ;
+  block_state.max_recvq.value = DEFAULT_RECVQ;
-–
+} '{' class_items '}' ';'
+  struct ClassItem *class = NULL;
+  class->max_sendq = block_state.max_sendq.value;
+  class->max_recvq = block_state.max_recvq.value;
-+
+  if (block_state.min_idle.value > block_state.max_idle.value)
-+
+  {
-+
+    block_state.min_idle.value = 0;
-+
+    block_state.max_idle.value = 0;
-+
+    block_state.flags.value &= ~CLASS_FLAGS_FAKE_IDLE;
-+
+  }
-+
-+
+  class->flags = block_state.flags.value;
-+
+  class->min_idle = block_state.min_idle.value;
-+
+  class->max_idle = block_state.max_idle.value;
-+
+  if (class->number_per_cidr && block_state.number_per_cidr.value)
+    if ((class->cidr_bitlen_ipv4 && block_state.cidr_bitlen_ipv4.value) ||
+        (class->cidr_bitlen_ipv6 && block_state.cidr_bitlen_ipv6.value))
+                class_max_local |
+                class_max_ident |
+                class_sendq | class_recvq |
-+
+                class_min_idle |
-+
+                class_max_idle |
-+
+                class_flags |
+                error ';' ;
+class_name: NAME '=' QSTRING ';'
+    block_state.number_per_cidr.value = $3;
+};
-+
+class_min_idle: MIN_IDLE '=' timespec ';'
-+
+{
-+
+  if (conf_parser_ctx.pass != 1)
-+
+    break;
-+
-+
+  block_state.min_idle.value = $3;
-+
+  block_state.flags.value |= CLASS_FLAGS_FAKE_IDLE;
-+
+};
-+
-+
+class_max_idle: MAX_IDLE '=' timespec ';'
-+
+{
-+
+  if (conf_parser_ctx.pass != 1)
-+
+    break;
-+
-+
+  block_state.max_idle.value = $3;
-+
+  block_state.flags.value |= CLASS_FLAGS_FAKE_IDLE;
-+
+};
-+
-+
+class_flags: IRCD_FLAGS
-+
+{
-+
+  if (conf_parser_ctx.pass == 1)
-+
+    block_state.flags.value &= CLASS_FLAGS_FAKE_IDLE;
-+
+} '='  class_flags_items ';';
-+
-+
+class_flags_items: class_flags_items ',' class_flags_item | class_flags_item;
-+
+class_flags_item: RANDOM_IDLE
-+
+{
-+
+  if (conf_parser_ctx.pass == 1)
-+
+    block_state.flags.value |= CLASS_FLAGS_RANDOM_IDLE;
-+
+} | HIDE_IDLE_FROM_OPERS
-+
+{
-+
+  if (conf_parser_ctx.pass == 1)
-+
+    block_state.flags.value |= CLASS_FLAGS_HIDE_IDLE_FROM_OPERS;
-+
+};
-+
-+
+/***************************************************************************
+ *  section listen
+ ***************************************************************************/
+      if (!ServerInfo.server_ctx)
+#endif
-<
+        yyerror("SSL not available - port closed");
->
+        conf_error_report("SSL not available - port closed");
+        break;
+    add_listener($1, block_state.addr.buf, block_state.flags.value);
+      if (!ServerInfo.server_ctx)
+#endif
-<
+        yyerror("SSL not available - port closed");
->
+        conf_error_report("SSL not available - port closed");
+        break;
+  reset_block_state();
+  strlcpy(block_state.rpass.buf, CONF_NOREASON, sizeof(block_state.rpass.buf));
-<
+} '{' resv_items '}' ';';
->
+} '{' resv_items '}' ';'
->
+{
->
+  if (IsChanPrefix(block_state.name.buf[0]))
->
+    create_channel_resv(block_state.name.buf, block_state.rpass.buf);
->
+  else if (block_state.name.buf[0])
->
+    create_nick_resv(block_state.name.buf, block_state.rpass.buf);
->
+};
+resv_items:     resv_items resv_item | resv_item;
-<
+resv_item:      resv_creason | resv_channel | resv_nick | error ';' ;
->
+resv_item:      resv_reason | resv_channel | resv_nick | error ';' ;
-<
+resv_creason: REASON '=' QSTRING ';'
->
+resv_reason: REASON '=' QSTRING ';'
+  if (conf_parser_ctx.pass == 2)
+    strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
+resv_channel: CHANNEL '=' QSTRING ';'
-<
+  if (conf_parser_ctx.pass != 2)
-<
+    break;
-<
-<
+  if (IsChanPrefix(*yylval.string))
-<
+    create_channel_resv(yylval.string, block_state.rpass.buf, 1);
->
+  if (conf_parser_ctx.pass == 2)
->
+    strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
+};
+resv_nick: NICK '=' QSTRING ';'
+  if (conf_parser_ctx.pass == 2)
-<
+    create_nick_resv(yylval.string, block_state.rpass.buf, 1);
->
+    strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
+};
+/***************************************************************************
+    break;
+  if ($3[0] == ':')
-<
+    yyerror("Server passwords cannot begin with a colon");
->
+    conf_error_report("Server passwords cannot begin with a colon");
+  else if (strchr($3, ' ') != NULL)
-<
+    yyerror("Server passwords cannot contain spaces");
->
+    conf_error_report("Server passwords cannot contain spaces");
+  else
+    strlcpy(block_state.spass.buf, yylval.string, sizeof(block_state.spass.buf));
+};
+    break;
+  if ($3[0] == ':')
-<
+    yyerror("Server passwords cannot begin with a colon");
->
+    conf_error_report("Server passwords cannot begin with a colon");
+  else if (strchr($3, ' ') != NULL)
-<
+    yyerror("Server passwords cannot contain spaces");
->
+    conf_error_report("Server passwords cannot contain spaces");
+  else
+    strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
+};
+    strlcpy(block_state.ciph.buf, yylval.string, sizeof(block_state.ciph.buf));
+#else
+  if (conf_parser_ctx.pass == 2)
-<
+    yyerror("Ignoring connect::ciphers -- no OpenSSL support");
->
+    conf_error_report("Ignoring connect::ciphers -- no OpenSSL support");
+#endif
+};
+    conf = conf_make(CONF_RXLINE);
+    conf->regexuser = exp_p;
+#else
-<
+    ilog(LOG_TYPE_IRCD, "Failed to add regular expression based X-Line: no PCRE support");
->
+    conf_error_report("Failed to add regular expression based X-Line: no PCRE support");
+    break;
+#endif
+                    general_pace_wait_simple | general_stats_P_oper_only |
+                    general_short_motd | general_no_oper_flood |
+                    general_true_no_oper_flood | general_oper_pass_resv |
-–
+                    general_message_locale |
+                    general_oper_only_umodes | general_max_targets |
+                    general_use_egd | general_egdpool_path |
+                    general_oper_umodes | general_caller_id_wait |
+  ConfigFileEntry.oper_pass_resv = yylval.number;
+};
-–
+general_message_locale: MESSAGE_LOCALE '=' QSTRING ';'
-–
+{
-–
+  if (conf_parser_ctx.pass == 2)
-–
+  {
-–
+    if (strlen(yylval.string) > LOCALE_LENGTH-2)
-–
+      yylval.string[LOCALE_LENGTH-1] = '\0';
-–
-–
+    set_locale(yylval.string);
-–
+  }
-–
+};
-–
+general_dots_in_ident: DOTS_IN_IDENT '=' NUMBER ';'
+  ConfigFileEntry.dots_in_ident = $3;
+serverhide_items:   serverhide_items serverhide_item | serverhide_item;
+serverhide_item:    serverhide_flatten_links | serverhide_hide_servers |
-+
+                    serverhide_hide_services |
+                    serverhide_links_delay |
+                    serverhide_hidden | serverhide_hidden_name |
+                    serverhide_hide_server_ips |
+    ConfigServerHide.hide_servers = yylval.number;
+};
-+
+serverhide_hide_services: HIDE_SERVICES '=' TBOOL ';'
-+
+{
-+
+  if (conf_parser_ctx.pass == 2)
-+
+    ConfigServerHide.hide_services = yylval.number;
-+
+};
-+
+serverhide_hidden_name: HIDDEN_NAME '=' QSTRING ';'
+  if (conf_parser_ctx.pass == 2)

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines (old)
->
+Changed lines (new)

Comparing ircd-hybrid/trunk/src/conf_parser.y (file contents): Revision 1736 by michael, Sun Jan 13 09:31:46 2013 UTC vs. Revision 1851 by michael, Wed Apr 24 18:31:06 2013 UTC

Diff Legend

Comparing ircd-hybrid/trunk/src/conf_parser.y (file contents):
Revision 1736 by michael, Sun Jan 13 09:31:46 2013 UTC vs.
Revision 1851 by michael, Wed Apr 24 18:31:06 2013 UTC