From b5bfac4bc7effc7312cb1575e9718aa4215c7e80 Mon Sep 17 00:00:00 2001 From: David Schmitz <schmitz@lrz.de> Date: Wed, 11 Jun 2025 13:10:13 +0000 Subject: [PATCH] testing: update inst/testing/nemo1/: update --- inst/testing/nemo1/etc/dfn-info/dfn-info.json | 60 ++++++++++++++++++- .../nemo1/mynemo-mitigation-init-db-final.sh | 28 ++++++++- .../testing/nemo1/nemo-initial-detectors1.sql | 4 +- 3 files changed, 87 insertions(+), 5 deletions(-) diff --git a/inst/testing/nemo1/etc/dfn-info/dfn-info.json b/inst/testing/nemo1/etc/dfn-info/dfn-info.json index c437335f..2a503054 100644 --- a/inst/testing/nemo1/etc/dfn-info/dfn-info.json +++ b/inst/testing/nemo1/etc/dfn-info/dfn-info.json @@ -2,11 +2,67 @@ "routers": [ { "name": "freertr1", + "devicetype": "freertr", "ip4": "10.197.36.3", "samplerate": "1", "category": "core", - "latitude": "1", - "longitude": "1" + "latitude": 52.2929, + "longitude": 4.8336, + "comments" : "test1" + }, + { + "name": "host1", + "ip4": "10.10.10.10", + "samplerate": "1", + "category": "customer", + "latitude": 52.3929, + "longitude": 5.9336 + }, + { + "name": "host2", + "ip4": "10.10.10.10", + "samplerate": "1", + "category": "customer", + "latitude": 51.3929, + "longitude": 4.9336 } + ], + "lines" : [ + { + "category": "core", + "bandwidth": "", + "name": "freertr1-host1", + "interfaces": [ + { + "router": "freertr1", + "interface_name": "1", + "interface_number": 1 + }, + { + "router": "host1", + "interface_name": "1", + "interface_number": 1 + } + ], + "tags": [] + }, + { + "category": "core", + "bandwidth": "", + "name": "freertr1-host2", + "interfaces": [ + { + "router": "freertr1", + "interface_name": "2", + "interface_number": 2 + }, + { + "router": "host2", + "interface_name": "1", + "interface_number": 1 + } + ], + "tags": [] + } ] } diff --git a/inst/testing/nemo1/mynemo-mitigation-init-db-final.sh b/inst/testing/nemo1/mynemo-mitigation-init-db-final.sh index 38f68300..5c02841d 100755 --- a/inst/testing/nemo1/mynemo-mitigation-init-db-final.sh +++ b/inst/testing/nemo1/mynemo-mitigation-init-db-final.sh @@ -6,6 +6,8 @@ set -x docker exec -ti nemo_mitigated_1 /services/inst/nemo-erkennung/bin/nemo-dbadmin add_net --comments "attacker network" 10.1.10.0/24 docker exec -ti nemo_mitigated_1 /services/inst/nemo-erkennung/bin/nemo-dbadmin add_net --comments "victim network" 10.2.10.0/24 +#docker exec -ti nemo_mitigated_1 /services/inst/nemo-erkennung/bin/nemo-dbadmin add_net --comments "victim host" 10.2.10.12/32 +#docker exec -ti nemo_mitigated_1 /services/inst/nemo-erkennung/bin/nemo-dbadmin add_net --comments "attacker host" 10.1.10.11/32 idx=2 #for add_net in $(docker exec -i freertr ip a | grep -o "veth[3-9]@"); do @@ -15,7 +17,31 @@ for add_net in $(grep -- "ipv4 address 10.[3-9].10.3" frnet/docker-compose/freer docker exec -ti nemo_mitigated_1 /services/inst/nemo-erkennung/bin/nemo-dbadmin add_net --comments "customer$idx network" "10.$idx.10.0/24" done -docker exec -ti nemo_nemodb_1 psql -U nemo -c "INSERT INTO router_nets (router_id, net_id) VALUES (1, 1), (1, 2), (1, 3)" +# + +#docker exec -ti nemo_nemodb_1 psql -U nemo -c "INSERT INTO router_nets (router_id, net_id) VALUES (1, 1), (1, 2), (2, 2), (3, 1)" +set -x +num=1 +echo "select id, name from router;" | docker exec -i nemo_nemodb_1 psql -U nemo -t | while read id sep1 name; do + echo "loop id=$id <-> name=$name" 1>&2 + + case "$name" in + freertr1*) + docker exec nemo_nemodb_1 psql -U nemo -c "INSERT INTO router_nets (router_id, net_id) VALUES ($id, 1), ($id, 2)" + ;; + host1*) + docker exec nemo_nemodb_1 psql -U nemo -c "INSERT INTO router_nets (router_id, net_id) VALUES ($id, 1)" + ;; + host2*) + docker exec nemo_nemodb_1 psql -U nemo -c "INSERT INTO router_nets (router_id, net_id) VALUES ($id, 2)" + ;; + esac + + num=$(( $num + 1 )) +done + +# + cat /nemo-all/nemo-initial-detectors1.sql | docker exec -i nemo_nemodb_1 psql -U nemo nemo diff --git a/inst/testing/nemo1/nemo-initial-detectors1.sql b/inst/testing/nemo1/nemo-initial-detectors1.sql index e7ae3871..4270a7ef 100644 --- a/inst/testing/nemo1/nemo-initial-detectors1.sql +++ b/inst/testing/nemo1/nemo-initial-detectors1.sql @@ -84,14 +84,14 @@ SELECT pg_catalog.setval('public.detector_param_id_seq', 1, false); -- Name: tag_id_seq; Type: SEQUENCE SET; Schema: public; Owner: nemo -- -SELECT pg_catalog.setval('public.tag_id_seq', 2, true); +SELECT pg_catalog.setval('public.tag_id_seq', 3, true); -- -- Name: tagged_item_id_seq; Type: SEQUENCE SET; Schema: public; Owner: nemo -- -SELECT pg_catalog.setval('public.tagged_item_id_seq', 2, true); +SELECT pg_catalog.setval('public.tagged_item_id_seq', 4, true); -- -- GitLab