Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bgpd: misc RPKI fixes #15051

Closed
wants to merge 13 commits into from
Closed

bgpd: misc RPKI fixes #15051

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
f53e5d5
bgpd: fix show rpki json void output
louis-6wind Dec 15, 2023
0b7a7ba
bgpd: fix rpki compilation without rtrlib ssh
louis-6wind Dec 21, 2023
0cf6446
topotests: add bgp_rpki_topo1
louis-6wind Dec 15, 2023
ed1726f
topotests: bgp_rpki_topo1, load config at startup
louis-6wind Dec 19, 2023
aac9088
topotests: resent cache at reset in rtrd.py
louis-6wind Dec 19, 2023
a947ebd
topotests: add tests to bgp_rpki_topo1
louis-6wind Dec 19, 2023
b13fbfa
bgpd: fix crash when re-adding a rpki server
louis-6wind Dec 19, 2023
eaeb581
bgpd: fix resetting rpki timer at no rpki
louis-6wind Dec 19, 2023
c665d33
bgpd: remove double spaces with rpki running config & ssh
pguibert6WIND Sep 5, 2019
7a40143
bgpd: do not show default rpki timers in show run
pguibert6WIND Sep 19, 2019
d1e523b
doc: add show rpki configuration
louis-6wind Dec 21, 2023
69a6875
bgpd: add hooks for displaying module debug messages
pguibert6WIND Sep 19, 2019
a4c54dd
bgpd: fix debug rpki display in show run
pguibert6WIND Sep 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions bgpd/bgp_debug.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
#include "memory.h"
#include "queue.h"
#include "filter.h"
#include "hook.h"

#include "bgpd/bgpd.h"
#include "bgpd/bgp_aspath.h"
Expand All @@ -37,6 +38,9 @@

#include "bgpd/bgp_debug_clippy.c"

DEFINE_HOOK(bgp_hook_config_write_debug, (struct vty *vty, bool running),
(vty, running));

unsigned long conf_bgp_debug_as4;
unsigned long conf_bgp_debug_neighbor_events;
unsigned long conf_bgp_debug_events;
Expand Down Expand Up @@ -2245,6 +2249,8 @@ DEFUN_NOSH (show_debugging_bgp,

cmd_show_lib_debugs(vty);

hook_call(bgp_hook_config_write_debug, vty, false);

return CMD_SUCCESS;
}

Expand Down Expand Up @@ -2379,6 +2385,9 @@ static int bgp_config_write_debug(struct vty *vty)
write++;
}

if (hook_call(bgp_hook_config_write_debug, vty, true))
write++;

return write;
}

Expand Down
6 changes: 6 additions & 0 deletions bgpd/bgp_debug.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,15 @@
#ifndef _QUAGGA_BGP_DEBUG_H
#define _QUAGGA_BGP_DEBUG_H

#include "hook.h"
#include "vty.h"

#include "bgp_attr.h"
#include "bgp_updgrp.h"

DECLARE_HOOK(bgp_hook_config_write_debug, (struct vty *vty, bool running),
(vty, running));

/* sort of packet direction */
#define DUMP_ON 1
#define DUMP_SEND 2
Expand Down
145 changes: 120 additions & 25 deletions bgpd/bgp_rpki.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
#include "bgpd/bgp_aspath.h"
#include "bgpd/bgp_route.h"
#include "bgpd/bgp_rpki.h"
#include "bgpd/bgp_debug.h"
#include "northbound_cli.h"

#include "lib/network.h"
#include "rtrlib/rtrlib.h"
#include "hook.h"
Expand All @@ -56,14 +56,19 @@ DEFINE_MTYPE_STATIC(BGPD, BGP_RPKI_REVALIDATE, "BGP RPKI Revalidation");
static struct event *t_rpki_sync;

#define RPKI_DEBUG(...) \
if (rpki_debug) { \
if (rpki_debug_conf || rpki_debug_term) { \
zlog_debug("RPKI: " __VA_ARGS__); \
}

#define RPKI_OUTPUT_STRING "Control rpki specific settings\n"

struct cache {
enum { TCP, SSH } type;
enum {
TCP,
#if defined(FOUND_SSH)
SSH
#endif
} type;
struct tr_socket *tr_socket;
union {
struct tr_tcp_config *tcp_config;
Expand All @@ -83,6 +88,7 @@ struct rpki_for_each_record_arg {
enum asnotation_mode asnotation;
};

static int bgp_rpki_write_debug(struct vty *vty, bool running);
static int start(void);
static void stop(void);
static int reset(bool force);
Expand Down Expand Up @@ -124,7 +130,7 @@ static bool rtr_is_running;
static bool rtr_is_stopping;
static bool rtr_is_synced;
static _Atomic int rtr_update_overflow;
static bool rpki_debug;
static bool rpki_debug_conf, rpki_debug_term;
static unsigned int polling_period;
static unsigned int expire_interval;
static unsigned int retry_interval;
Expand Down Expand Up @@ -593,7 +599,8 @@ static void rpki_init_sync_socket(void)

static int bgp_rpki_init(struct event_loop *master)
{
rpki_debug = false;
rpki_debug_conf = false;
rpki_debug_term = false;
rtr_is_running = false;
rtr_is_stopping = false;
rtr_is_synced = false;
Expand Down Expand Up @@ -627,6 +634,7 @@ static int bgp_rpki_module_init(void)
hook_register(bgp_rpki_prefix_status, rpki_validate_prefix);
hook_register(frr_late_init, bgp_rpki_init);
hook_register(frr_early_fini, bgp_rpki_fini);
hook_register(bgp_hook_config_write_debug, &bgp_rpki_write_debug);

return 0;
}
Expand Down Expand Up @@ -733,7 +741,9 @@ static void print_prefix_table_by_asn(struct vty *vty, as_t as,
arg.asnotation = bgp_get_asnotation(bgp_lookup_by_vrf_id(VRF_DEFAULT));

if (!group) {
if (!json)
if (json)
vty_json(vty, json);
else
vty_out(vty, "Cannot find a connected group.\n");
return;
}
Expand Down Expand Up @@ -786,7 +796,9 @@ static void print_prefix_table(struct vty *vty, json_object *json)
arg.asnotation = bgp_get_asnotation(bgp_lookup_by_vrf_id(VRF_DEFAULT));

if (!group) {
if (!json)
if (json)
vty_json(vty, json);
else
vty_out(vty, "Cannot find a connected group.\n");
return;
}
Expand Down Expand Up @@ -1036,13 +1048,30 @@ static void free_cache(struct cache *cache)
XFREE(MTYPE_BGP_RPKI_CACHE, cache);
}

static int bgp_rpki_write_debug(struct vty *vty, bool running)
{
if (rpki_debug_conf && running) {
vty_out(vty, "debug rpki\n");
return 1;
}
if ((rpki_debug_conf || rpki_debug_term) && !running) {
vty_out(vty, " BGP RPKI debugging is on\n");
ton31337 marked this conversation as resolved.
Show resolved Hide resolved
return 1;
}
return 0;
}

static int config_write(struct vty *vty)
{
struct listnode *cache_node;
struct cache *cache;

if (rpki_debug)
vty_out(vty, "debug rpki\n");
if (list_isempty(cache_list) &&
polling_period == POLLING_PERIOD_DEFAULT &&
retry_interval == RETRY_INTERVAL_DEFAULT &&
expire_interval == EXPIRE_INTERVAL_DEFAULT)
/* do not display the default config values */
return 0;

vty_out(vty, "!\n");
vty_out(vty, "rpki\n");
Expand Down Expand Up @@ -1077,7 +1106,7 @@ static int config_write(struct vty *vty)
ssh_config->client_privkey_path,
ssh_config->server_hostkey_path != NULL
? ssh_config->server_hostkey_path
: " ");
: "");
if (ssh_config->bindaddr)
vty_out(vty, "source %s ",
ssh_config->bindaddr);
Expand Down Expand Up @@ -1111,6 +1140,10 @@ DEFPY (no_rpki,
{
rpki_delete_all_cache_nodes();
stop();
polling_period = POLLING_PERIOD_DEFAULT;
ton31337 marked this conversation as resolved.
Show resolved Hide resolved
expire_interval = EXPIRE_INTERVAL_DEFAULT;
retry_interval = RETRY_INTERVAL_DEFAULT;

return CMD_SUCCESS;
}

Expand Down Expand Up @@ -1238,6 +1271,7 @@ DEFPY(rpki_cache, rpki_cache_cmd,
int return_value;
struct listnode *cache_node;
struct cache *current_cache;
bool init = !!list_isempty(cache_list);

for (ALL_LIST_ELEMENTS_RO(cache_list, cache_node, current_cache)) {
if (current_cache->preference == preference) {
Expand Down Expand Up @@ -1270,6 +1304,9 @@ DEFPY(rpki_cache, rpki_cache_cmd,
return CMD_WARNING;
}

if (init)
start();

return CMD_SUCCESS;
}

Expand Down Expand Up @@ -1326,15 +1363,17 @@ DEFPY (show_rpki_prefix_table,
{
struct json_object *json = NULL;

if (uj)
json = json_object_new_object();

if (!is_synchronized()) {
if (!uj)
if (uj)
vty_json(vty, json);
else
vty_out(vty, "No connection to RPKI cache server.\n");
return CMD_WARNING;
}

if (uj)
json = json_object_new_object();

print_prefix_table(vty, json);
return CMD_SUCCESS;
}
Expand All @@ -1350,15 +1389,17 @@ DEFPY (show_rpki_as_number,
{
struct json_object *json = NULL;

if (uj)
json = json_object_new_object();

if (!is_synchronized()) {
if (!uj)
if (uj)
vty_json(vty, json);
else
vty_out(vty, "No Connection to RPKI cache server.\n");
return CMD_WARNING;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is it possible to encapsulate error message in a json attribute ?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point @pguibert6WIND, we might do this for all warning/error handling. Would be useful.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I carry on in #15034
1f1b839 has been added for that

}

if (uj)
json = json_object_new_object();

print_prefix_table_by_asn(vty, by_asn, json);
return CMD_SUCCESS;
}
Expand All @@ -1378,8 +1419,13 @@ DEFPY (show_rpki_prefix,
json_object *json_records = NULL;
enum asnotation_mode asnotation;

if (uj)
json = json_object_new_object();

if (!is_synchronized()) {
if (!uj)
if (uj)
vty_json(vty, json);
else
vty_out(vty, "No Connection to RPKI cache server.\n");
return CMD_WARNING;
}
Expand All @@ -1392,7 +1438,9 @@ DEFPY (show_rpki_prefix,
memcpy(addr_str, prefix_str, addr_len);

if (lrtr_ip_str_to_addr(addr_str, &addr) != 0) {
if (!json)
if (json)
vty_json(vty, json);
else
vty_out(vty, "Invalid IP prefix\n");
return CMD_WARNING;
}
Expand All @@ -1404,13 +1452,13 @@ DEFPY (show_rpki_prefix,
if (pfx_table_validate_r(rtr_config->pfx_table, &matches, &match_count,
asn, &addr, prefix->prefixlen,
&result) != PFX_SUCCESS) {
if (!json)
if (json)
vty_json(vty, json);
else
vty_out(vty, "Prefix lookup failed\n");
return CMD_WARNING;
}

if (uj)
json = json_object_new_object();

if (!json) {
vty_out(vty, "%-40s %s %s\n", "Prefix", "Prefix Length",
Expand Down Expand Up @@ -1656,6 +1704,46 @@ DEFPY (show_rpki_cache_connection,
return CMD_SUCCESS;
}

DEFPY(show_rpki_configuration, show_rpki_configuration_cmd,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Documentation is missing for this new CLI.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done d1e523b

"show rpki configuration [json$uj]",
SHOW_STR RPKI_OUTPUT_STRING
"Show RPKI configuration\n"
JSON_STR)
{
struct json_object *json = NULL;

if (uj) {
json = json_object_new_object();
json_object_boolean_add(json, "enabled",
!!listcount(cache_list));
json_object_int_add(json, "serversCount", listcount(cache_list));
json_object_int_add(json, "pollingPeriodSeconds",
polling_period);
json_object_int_add(json, "retryIntervalSeconds",
retry_interval);
json_object_int_add(json, "expireIntervalSeconds",
expire_interval);

vty_json(vty, json);

return CMD_SUCCESS;
}

vty_out(vty, "rpki is %s",
listcount(cache_list) ? "Enabled" : "Disabled");

if (list_isempty(cache_list))
return CMD_SUCCESS;

vty_out(vty, " (%d cache servers configured)", listcount(cache_list));
vty_out(vty, "\n");
vty_out(vty, "\tpolling period %d\n", polling_period);
vty_out(vty, "\tretry interval %d\n", retry_interval);
vty_out(vty, "\texpire interval %d\n", expire_interval);

return CMD_SUCCESS;
}

static int config_on_exit(struct vty *vty)
{
reset(false);
Expand All @@ -1677,7 +1765,10 @@ DEFUN (debug_rpki,
DEBUG_STR
"Enable debugging for rpki\n")
{
rpki_debug = true;
if (vty->node == CONFIG_NODE)
rpki_debug_conf = true;
else
rpki_debug_term = true;
return CMD_SUCCESS;
}

Expand All @@ -1688,7 +1779,10 @@ DEFUN (no_debug_rpki,
DEBUG_STR
"Disable debugging for rpki\n")
{
rpki_debug = false;
if (vty->node == CONFIG_NODE)
rpki_debug_conf = true;
else
rpki_debug_term = true;
return CMD_SUCCESS;
}

Expand Down Expand Up @@ -1769,6 +1863,7 @@ static void install_cli_commands(void)
install_element(VIEW_NODE, &show_rpki_cache_server_cmd);
install_element(VIEW_NODE, &show_rpki_prefix_cmd);
install_element(VIEW_NODE, &show_rpki_as_number_cmd);
install_element(VIEW_NODE, &show_rpki_configuration_cmd);

/* Install debug commands */
install_element(CONFIG_NODE, &debug_rpki_cmd);
Expand Down
4 changes: 4 additions & 0 deletions doc/user/rpki.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,10 @@ Debugging
Displaying RPKI
---------------

.. clicmd:: show rpki configuration [json]

Display RPKI configuration state including timers values.

.. clicmd:: show rpki prefix <A.B.C.D/M|X:X::X:X/M> [(1-4294967295)] [json]

Display validated prefixes received from the cache servers filtered
Expand Down
Empty file added tests/topotests/bgp_rpki_topo1/__init__.py
View file
Open in desktop
Empty file.
Loading
Loading