[#3556] release changes

isc-projects · Aug 26, 2024 · ba861d8 · ba861d8
1 parent f5d04e6
commit ba861d8
Show file tree

Hide file tree

Showing 21 changed files with 518 additions and 190 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,13 +1,16 @@
+Kea 2.7.2 (development) released on August 28, 2024
+
 2277.	[build]		andrei
 	"libca_rbac.so" is now a symbolic link to "libdhcp_rbac.so".
+	(Gitlab #3550)
 
 2276.	[build]		razvan
 	The library version numbers have been bumped up for the Kea 2.7.2
 	development release.
 	(Gitlab #3549)
 
 2275.	[func]		andrei
-	When running with High-Availibility (HA) enabled, the status-get
+	When running with High-Availability (HA) enabled, the status-get
 	command now includes in its response the system time for each HA
 	node and the clock skew in seconds between active peers.
 	(Gitlab #3513)

diff --git a/doc/sphinx/debug-messages.rst b/doc/sphinx/debug-messages.rst
@@ -779,26 +779,26 @@ Messages printed on debuglevel 40
 - RBAC_CONFIGURED_ACLS
 - RBAC_CONFIGURED_COMMANDS
 - RBAC_CONFIGURED_ROLES
-- RBAC_TRACE_AUTH_ACCEPT
-- RBAC_TRACE_AUTH_BAD_BODY_TYPE
-- RBAC_TRACE_AUTH_BAD_COMMAND_TYPE
-- RBAC_TRACE_AUTH_COMMAND
-- RBAC_TRACE_AUTH_DISABLED
-- RBAC_TRACE_AUTH_EMPTY_BODY
-- RBAC_TRACE_AUTH_NO_COMMAND
-- RBAC_TRACE_AUTH_NO_JSON
-- RBAC_TRACE_AUTH_NO_REQUEST
-- RBAC_TRACE_AUTH_NO_TLS_REJECT
-- RBAC_TRACE_AUTH_REJECT
-- RBAC_TRACE_AUTH_RESPONSE
-- RBAC_TRACE_AUTH_ROLE
-- RBAC_TRACE_RESPONSE_BAD_BODY_TYPE
-- RBAC_TRACE_RESPONSE_CONTEXT
-- RBAC_TRACE_RESPONSE_DISABLED
-- RBAC_TRACE_RESPONSE_EMPTY_BODY
-- RBAC_TRACE_RESPONSE_EMPTY_BODY_LIST
-- RBAC_TRACE_RESPONSE_MODIFIED
-- RBAC_TRACE_RESPONSE_NO_ARGUMENTS
+- RBAC_TRACE_HTTP_AUTH_ACCEPT
+- RBAC_TRACE_HTTP_AUTH_BAD_BODY_TYPE
+- RBAC_TRACE_HTTP_AUTH_BAD_COMMAND_TYPE
+- RBAC_TRACE_HTTP_AUTH_COMMAND
+- RBAC_TRACE_HTTP_AUTH_DISABLED
+- RBAC_TRACE_HTTP_AUTH_EMPTY_BODY
+- RBAC_TRACE_HTTP_AUTH_NO_COMMAND
+- RBAC_TRACE_HTTP_AUTH_NO_JSON
+- RBAC_TRACE_HTTP_AUTH_NO_REQUEST
+- RBAC_TRACE_HTTP_AUTH_NO_TLS_REJECT
+- RBAC_TRACE_HTTP_AUTH_REJECT
+- RBAC_TRACE_HTTP_AUTH_RESPONSE
+- RBAC_TRACE_HTTP_AUTH_ROLE
+- RBAC_TRACE_HTTP_RESPONSE_BAD_BODY_TYPE
+- RBAC_TRACE_HTTP_RESPONSE_CONTEXT
+- RBAC_TRACE_HTTP_RESPONSE_DISABLED
+- RBAC_TRACE_HTTP_RESPONSE_EMPTY_BODY
+- RBAC_TRACE_HTTP_RESPONSE_EMPTY_BODY_LIST
+- RBAC_TRACE_HTTP_RESPONSE_MODIFIED
+- RBAC_TRACE_HTTP_RESPONSE_NO_ARGUMENTS
 - START_REKEY_TIMER
 - START_RETRY_TIMER
 - STAT_CMDS_LEASE4_ORPHANED_STATS
@@ -1152,6 +1152,7 @@ Messages printed on debuglevel 55
 - DHCP_DDNS_REQUEST_DROPPED
 - DHCP_DDNS_REV_REQUEST_IGNORED
 - EVAL_DEBUG_AND
+- EVAL_DEBUG_BRANCH
 - EVAL_DEBUG_CONCAT
 - EVAL_DEBUG_EQUAL
 - EVAL_DEBUG_HEXSTRING
@@ -1171,6 +1172,9 @@ Messages printed on debuglevel 55
 - EVAL_DEBUG_PKT
 - EVAL_DEBUG_PKT4
 - EVAL_DEBUG_PKT6
+- EVAL_DEBUG_POP_AND_BRANCH_FALSE
+- EVAL_DEBUG_POP_OR_BRANCH_FALSE
+- EVAL_DEBUG_POP_OR_BRANCH_TRUE
 - EVAL_DEBUG_RELAY6
 - EVAL_DEBUG_RELAY6_RANGE
 - EVAL_DEBUG_SPLIT

diff --git a/doc/sphinx/grammar/grammar-d2-parser.rst b/doc/sphinx/grammar/grammar-d2-parser.rst
@@ -81,6 +81,7 @@ This grammar is generated from ``d2_parser.yy``. See :ref:`dhcp-ddns-server` for
                    | reverse_ddns
                    | tsig_keys
                    | control_socket
+                   | control_sockets
                    | hooks_libraries
                    | loggers
                    | user_context
@@ -218,20 +219,107 @@ This grammar is generated from ``d2_parser.yy``. See :ref:`dhcp-ddns-server` for
 
      control_socket ::= "control-socket" ":" "{" control_socket_params "}"
 
+     control_sockets ::= "control-sockets" ":" "[" control_socket_list "]"
+
+     control_socket_list ::= 
+                        | not_empty_control_socket_list
+
+     not_empty_control_socket_list ::= control_socket_entry
+                                  | not_empty_control_socket_list "," control_socket_entry
+                                  | not_empty_control_socket_list ","
+
+     control_socket_entry ::= "{" control_socket_params "}"
+
      control_socket_params ::= control_socket_param
                           | control_socket_params "," control_socket_param
                           | control_socket_params ","
 
      control_socket_param ::= control_socket_type
                          | control_socket_name
+                         | control_socket_address
+                         | control_socket_port
+                         | authentication
+                         | trust_anchor
+                         | cert_file
+                         | key_file
+                         | cert_required
                          | user_context
                          | comment
                          | unknown_map_entry
 
-     control_socket_type ::= "socket-type" ":" STRING
+     control_socket_type ::= "socket-type" ":" control_socket_type_value
+
+     control_socket_type_value ::= "unix"
+                              | "http"
+                              | "https"
 
      control_socket_name ::= "socket-name" ":" STRING
 
+     control_socket_address ::= "socket-address" ":" STRING
+
+     control_socket_port ::= "socket-port" ":" INTEGER
+
+     trust_anchor ::= "trust-anchor" ":" STRING
+
+     cert_file ::= "cert-file" ":" STRING
+
+     key_file ::= "key-file" ":" STRING
+
+     cert_required ::= "cert-required" ":" BOOLEAN
+
+     authentication ::= "authentication" ":" "{" auth_params "}"
+
+     auth_params ::= auth_param
+                | auth_params "," auth_param
+                | auth_params ","
+
+     auth_param ::= auth_type
+               | realm
+               | directory
+               | clients
+               | comment
+               | user_context
+               | unknown_map_entry
+
+     auth_type ::= "type" ":" auth_type_value
+
+     auth_type_value ::= "basic"
+
+     realm ::= "realm" ":" STRING
+
+     directory ::= "directory" ":" STRING
+
+     clients ::= "clients" ":" "[" clients_list "]"
+
+     clients_list ::= 
+                 | not_empty_clients_list
+
+     not_empty_clients_list ::= basic_auth
+                           | not_empty_clients_list "," basic_auth
+                           | not_empty_clients_list ","
+
+     basic_auth ::= "{" clients_params "}"
+
+     clients_params ::= clients_param
+                   | clients_params "," clients_param
+                   | clients_params ","
+
+     clients_param ::= user
+                  | user_file
+                  | password
+                  | password_file
+                  | user_context
+                  | comment
+                  | unknown_map_entry
+
+     user ::= "user" ":" STRING
+
+     user_file ::= "user-file" ":" STRING
+
+     password ::= "password" ":" STRING
+
+     password_file ::= "password-file" ":" STRING
+
      hooks_libraries ::= "hooks-libraries" ":" "[" hooks_libraries_list "]"
 
      hooks_libraries_list ::= 

diff --git a/doc/sphinx/grammar/grammar-dhcp4-parser.rst b/doc/sphinx/grammar/grammar-dhcp4-parser.rst
@@ -107,6 +107,7 @@ This grammar is generated from ``dhcp4_parser.yy``. See :ref:`dhcp4` for more de
                  | expired_leases_processing
                  | dhcp4o6_port
                  | control_socket
+                 | control_sockets
                  | dhcp_queue_control
                  | dhcp_ddns
                  | echo_client_id
@@ -864,20 +865,97 @@ This grammar is generated from ``dhcp4_parser.yy``. See :ref:`dhcp4` for more de
 
      control_socket ::= "control-socket" ":" "{" control_socket_params "}"
 
+     control_sockets ::= "control-sockets" ":" "[" control_socket_list "]"
+
+     control_socket_list ::= 
+                        | not_empty_control_socket_list
+
+     not_empty_control_socket_list ::= control_socket_entry
+                                  | not_empty_control_socket_list "," control_socket_entry
+                                  | not_empty_control_socket_list ","
+
+     control_socket_entry ::= "{" control_socket_params "}"
+
      control_socket_params ::= control_socket_param
                           | control_socket_params "," control_socket_param
                           | control_socket_params ","
 
      control_socket_param ::= control_socket_type
                          | control_socket_name
+                         | control_socket_address
+                         | control_socket_port
+                         | authentication
+                         | trust_anchor
+                         | cert_file
+                         | key_file
+                         | cert_required
                          | user_context
                          | comment
                          | unknown_map_entry
 
-     control_socket_type ::= "socket-type" ":" STRING
+     control_socket_type ::= "socket-type" ":" control_socket_type_value
+
+     control_socket_type_value ::= "unix"
+                              | "http"
+                              | "https"
 
      control_socket_name ::= "socket-name" ":" STRING
 
+     control_socket_address ::= "socket-address" ":" STRING
+
+     control_socket_port ::= "socket-port" ":" INTEGER
+
+     cert_required ::= "cert-required" ":" BOOLEAN
+
+     authentication ::= "authentication" ":" "{" auth_params "}"
+
+     auth_params ::= auth_param
+                | auth_params "," auth_param
+                | auth_params ","
+
+     auth_param ::= auth_type
+               | realm
+               | directory
+               | clients
+               | comment
+               | user_context
+               | unknown_map_entry
+
+     auth_type ::= "type" ":" auth_type_value
+
+     auth_type_value ::= "basic"
+
+     realm ::= "realm" ":" STRING
+
+     directory ::= "directory" ":" STRING
+
+     clients ::= "clients" ":" "[" clients_list "]"
+
+     clients_list ::= 
+                 | not_empty_clients_list
+
+     not_empty_clients_list ::= basic_auth
+                           | not_empty_clients_list "," basic_auth
+                           | not_empty_clients_list ","
+
+     basic_auth ::= "{" clients_params "}"
+
+     clients_params ::= clients_param
+                   | clients_params "," clients_param
+                   | clients_params ","
+
+     clients_param ::= user
+                  | user_file
+                  | password
+                  | password_file
+                  | user_context
+                  | comment
+                  | unknown_map_entry
+
+     user_file ::= "user-file" ":" STRING
+
+     password_file ::= "password-file" ":" STRING
+
      dhcp_queue_control ::= "dhcp-queue-control" ":" "{" queue_control_params "}"
 
      queue_control_params ::= queue_control_param