parent 238ceed

author Afmurillo <[email protected]> 1629479791 +0800
committer Andrés F. Murillo <[email protected]> 1646797824 +0800

Updated physical process to only update sqlite DB and report results if a full timestep was completed using epynet

Testing a first implementation of a stale attack.
This is a simple type of attack that stops forwarding traffic when trigger conditions are met

Testing a first implementation of a stale attack.
This is a simple type of attack that stops forwarding traffic when trigger conditions are met

Updated physical process to only update sqlite DB and report results if a full timestep was completed using epynet

Updated physical process to only update sqlite DB and report results if a full timestep was completed using epynet

Updated physical process to only update sqlite DB and report results if a full timestep was completed using epynet

Updated physical process to only update sqlite DB and report results if a full timestep was completed using epynet

Update configuration.rst

Minor change to include the optional parameter "direction" in simple_dos_attack and naive_mitm_attack

Update attacks.rst

Minor update into naive_mitm documentation to include the optional 'direction' parameter

Update attacks.rst

Added entry for simple_dos attacks into the attacks documentation

Fixed issue with attack names. Now if an attack name has more than 10 characters, we will use only the first 10 characters for the attacker node name and its interfaces.

Framework for network events is ready. We will proceed to implement the packet loss event now.

Testing packet loss event

Testing packet loss event

Testing packet loss event

Update configuration to fix simulator option

Simulator option documentation was outdated, pointing to "pdd" or "dd" demand parameter

Testing packet loss event

Updating installation script to install dependencies for netfilterqueue in Python3

There is a possible dependency issue with WNTR 0.4.0

Testing packet loss event

Testing packet loss event

Updated physical process to only update sqlite DB and report results if a full timestep was completed using epynet

Updated physical process to only update sqlite DB and report results if a full timestep was completed using epynet

Updated physical process to only update sqlite DB and report results if a full timestep was completed using epynet

Update configuration.rst

Minor change to include the optional parameter "direction" in simple_dos_attack and naive_mitm_attack

Update attacks.rst

Minor update into naive_mitm documentation to include the optional 'direction' parameter

Update attacks.rst

Added entry for simple_dos attacks into the attacks documentation

Fixed issue with attack names. Now if an attack name has more than 10 characters, we will use only the first 10 characters for the attacker node name and its interfaces.

Framework for network events is ready. We will proceed to implement the packet loss event now.

Testing packet loss event

Testing packet loss event

Testing packet loss event

Update configuration to fix simulator option

Simulator option documentation was outdated, pointing to "pdd" or "dd" demand parameter

Updating installation script to install dependencies for netfilterqueue in Python3

There is a possible dependency issue with WNTR 0.4.0

Testing packet loss event

Condifuration documentation - network events

Updated configuration documentation to include network events

Fixing documentation

Fixing documentation

Create events.rst

Created the documentation page for network events

Adapted KY15 to have different District Metered Areas demand patterns

tuned the parameters for DoS attacks on complex water networks

Testing Davide's version of skipping intermediate steps.

tuned the parameters for DoS attacks on complex water networks

tuned the parameters for DoS attacks on complex water networks

Testing Davide's version of skipping intermediate steps.

Testing Davide's version of skipping intermediate steps.

Testing Davide's version of skipping intermediate steps.

tuned the parameters for DoS attacks on complex water networks

Testing Davide's version of skipping intermediate steps.

tuned the parameters for DoS attacks on complex water networks

Update install.sh

Newer version of matplotlib is potentially causing issues with pyparse, hopefully they'll fix that on their end, doing a workaround in the meantime

Temporary (hopefully) fix to pyproject.toml, setuptools 60 broke everything. There are multiple issues with latest version of setuptools

Initializing all the RNG with the same seed

Testing Davide's version of skipping intermediate steps.

Testing Davide's version of skipping intermediate steps.

Testing Davide's version of skipping intermediate steps.

Testing Davide's version of skipping intermediate steps.

Initializing all the RNG with the same seed

test to fix outdate data

Initializing all the RNG with the same seed

Fixed the synchronization between PLCs and physical process. Updated the simulation to register the initial values of the simulation at iteration 0 using epynet. We still need to confirm the values for the junctions pressure and pumps/valves flow. In addition, we need to extend the synchronization mechanism to the network attack scripts and network events

Fixed the synchronization between PLCs and physical process. Updated the simulation to register the initial values of the simulation at iteration 0 using epynet. We still need to confirm the values for the junctions pressure and pumps/valves flow. In addition, we need to extend the synchronization mechanism to the network attack scripts and network events

Fixed the synchronization between PLCs and physical process. Updated the simulation to register the initial values of the simulation at iteration 0 using epynet. We still need to confirm the values for the junctions pressure and pumps/valves flow. In addition, we need to extend the synchronization mechanism to the network attack scripts and network events

Fixed the synchronization between PLCs and physical process. Updated the simulation to register the initial values of the simulation at iteration 0 using epynet. We still need to confirm the values for the junctions pressure and pumps/valves flow. In addition, we need to extend the synchronization mechanism to the network attack scripts and network events

Fixed the synchronization between PLCs and physical process. Updated the simulation to register the initial values of the simulation at iteration 0 using epynet. We still need to confirm the values for the junctions pressure and pumps/valves flow. In addition, we need to extend the synchronization mechanism to the network attack scripts and network events

Applied the same synchronization scheme to network events

Applied the same synchronization scheme to network attacks

Applied the same synchronization scheme to network attacks

Applied the same synchronization scheme to network attacks

Applied the same synchronization scheme to network attacks

Applied the same synchronization scheme to network attacks

Applied the same synchronization scheme to network attacks

Applied the same synchronization scheme to network attacks

Minor changes to installation scripts, because setuptools 60.0 is causing installation issues

Author: afmurillo

.gitattributes

@@ -0,0 +1,2 @@
+# Declare files that will always have CRLF line endings on checkout.
+*.sln text eol=lf

dhalsim/command_line.py

@@ -46,6 +46,8 @@ def run(self):
                 yaml_paths.append(config_parser.generate_intermediate_yaml())
             for yaml_path in yaml_paths:
                 self.run_simulation(yaml_path)
+
+
         else:
             # Else generate the one we need and run the simulation
             intermediate_yaml_path = config_parser.generate_intermediate_yaml()

dhalsim/epynet/epynet/network.py

@@ -336,7 +336,7 @@ def solve(self, simtime=0):
         self.reset()
         self.ep.ENsettimeparam(4, simtime)
         self.ep.ENopenH()
-        self.ep.ENinitH(0)
+        self.ep.ENinitH(11)
         self.ep.ENrunH()
         self.ep.ENcloseH()
         self.solved = True
@@ -347,7 +347,7 @@ def run(self):
         self.time = []
         # open network
         self.ep.ENopenH()
-        self.ep.ENinitH(0)
+        self.ep.ENinitH(11)
 
         simtime = 0
         timestep = 1

dhalsim/epynet/network.py

@@ -129,7 +129,7 @@ def init_simulation(self, interactive=False):
         self.reset()
         self.times = []
         self.ep.ENopenH()
-        self.ep.ENinitH(flag=0)
+        self.ep.ENinitH(flag=11)
 
     def simulate_step(self, curr_time, actuators_status=None):
         """
@@ -138,18 +138,19 @@ def simulate_step(self, curr_time, actuators_status=None):
         :param curr_time: current simulation time
         :return: time until the next event, if 0 the simulation is going to end
         """
+
+        # update the status of actuators after the first step
+        # TODO: DHALSIM works with the status update here
+        if actuators_status and self.interactive:
+                self.update_actuators_status(actuators_status)
+
         self.ep.ENrunH()
         timestep = self.ep.ENnextH()
 
         # append new values to reports
         self.times.append(curr_time)
         self.load_attributes(curr_time)
 
-        # update the status of actuators after the first step
-        # TODO: DHALSIM works with the status update here
-        if actuators_status and self.interactive and timestep != 0:
-                self.update_actuators_status(actuators_status)
-
         return timestep, self.get_network_state()
 
     def update_actuators_status(self, new_status):

dhalsim/init_database.py

@@ -30,16 +30,23 @@ def write(self):
                     PRIMARY KEY (name, pid)
                 );""")
 
+
+            # Initialize actuators state in DB
             if "actuators" in self.data:
                 for actuator in self.data["actuators"]:
                     initial_state = "0" if actuator["initial_state"].lower() == "closed" else "1"
                     cur.execute("INSERT INTO plant VALUES (?, 1, ?);",
                                 (actuator["name"], initial_state,))
 
+            # Initialize sensors in DB, we should read EPANET file
             if "plcs" in self.data:
                 for plc in self.data["plcs"]:
                     for sensor in plc["sensors"]:
-                        cur.execute("INSERT INTO plant VALUES (?, 1, 0);", (sensor,))
+                        if sensor in self.data["initial_tank_values"]:
+                            # We only initialize tank levels into the SQlite3 DB
+                            cur.execute("INSERT INTO plant VALUES (?, 1, ?);", (sensor,self.data["initial_tank_values"][sensor]))
+                        else:
+                            cur.execute("INSERT INTO plant VALUES (?, 1, 0);", (sensor,))
 
             # Creates master_time table if it does not yet exist
             cur.execute("CREATE TABLE master_time (id INTEGER PRIMARY KEY, time INTEGER)")
@@ -56,14 +63,14 @@ def write(self):
 
             if "plcs" in self.data:
                 for plc in self.data["plcs"]:
-                    cur.execute("INSERT INTO sync (name, flag) VALUES (?, 1);",
+                    cur.execute("INSERT INTO sync (name, flag) VALUES (?, 0);",
                                 (plc["name"],))
 
-            cur.execute("INSERT INTO sync (name, flag) VALUES ('scada', 1);")
+            cur.execute("INSERT INTO sync (name, flag) VALUES ('scada', 0);")
 
             if "network_attacks" in self.data:
                 for attacker in self.data["network_attacks"]:
-                    cur.execute("INSERT INTO sync (name, flag) VALUES (?, 1);",
+                    cur.execute("INSERT INTO sync (name, flag) VALUES (?, 0);",
                                 (attacker["name"],))
 
             # Creates attack table
@@ -85,6 +92,25 @@ def write(self):
                     cur.execute("INSERT INTO attack (name, flag) VALUES (?, 0);",
                                 (network_attack["name"],))
 
+            # Event DB entries
+            # network event sync registers
+            if 'network_events' in self.data:
+                for event in self.data['network_events']:
+                    cur.execute("INSERT INTO sync (name, flag) VALUES (?, 0);",
+                                (event["name"],))
+
+            # Creates event table
+            cur.execute("""CREATE TABLE event (
+                name TEXT NOT NULL,
+                flag INT NOT NULL,
+                PRIMARY KEY (name)
+            );""")
+
+            if "network_events" in self.data:
+                for network_event in self.data["network_events"]:
+                    cur.execute("INSERT INTO event (name, flag) VALUES (?, 0);",
+                                (network_event["name"],))
+
             conn.commit()
 
     def drop(self):
@@ -94,6 +120,7 @@ def drop(self):
             cur.execute("DROP TABLE IF EXISTS master_time;")
             cur.execute("DROP TABLE IF EXISTS sync;")
             cur.execute("DROP TABLE IF EXISTS attack;")
+            cur.execute("DROP TABLE IF EXISTS event;")
             conn.commit()
 
     def print(self):
@@ -102,6 +129,7 @@ def print(self):
             self.logger.debug(pd.read_sql_query("SELECT * FROM master_time;", conn))
             self.logger.debug(pd.read_sql_query("SELECT * FROM sync;", conn))
             self.logger.debug(pd.read_sql_query("SELECT * FROM attack;", conn))
+            self.logger.debug(pd.read_sql_query("SELECT * FROM event;", conn))
 
 
 def is_valid_file(file_parser, arg):