Add fileSizeMax to sender #1285

sarracenia/flow/__init__.py

@@ -2829,6 +2829,10 @@ def do_send(self):
                 self.reject(msg, 422, f"new_file message field missing, do not know name of file to write. skipping." )
                 continue
 
+            if self.o.fileSizeMax > 0 and msg['size'] > self.o.fileSizeMax: 
+                self.reject(msg, 413, f"Payload Too Large {msg.getIDStr()}") 
+                continue
+
             # weed out non-file transfer operations that are configured to not be done.
             if 'fileOp' in msg:
                 if ('directory' in msg['fileOp']) and ('remove' in msg['fileOp']) and ( 'rmdir' not in self.o.fileEvents ):

sarracenia/flowcb/send/am.py

@@ -53,6 +53,11 @@ def __init__(self, options):
 
         self.o.add_option('MaxBulLen', 'count', 32768)
 
+        # Get a default value if not set
+        if self.o.fileSizeMax <= 0:
+            self.o.fileSizeMax = self.o.MaxBulLen
+            logger.warning(f"Attributing fileSizeMax, MaxBulLen value : {self.o.MaxBulLen} bytes max")
+
         # Initialise socket
         ## Create a TCP/IP socket
         self.s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
@@ -80,7 +85,7 @@ def wrapbulletin(self, sarra_msg):
         header = strdata[0:size]
 
         # Step out of the function if the bulletin size is too big
-        if len(strdata) > self.o.MaxBulLen:
+        if len(strdata) > self.o.fileSizeMax:
             raise Exception(f"Bulletin length too long. Bulletin limit length: {self.o.MaxBulLen}. Latest bulletin length: {len(strdata)}. Path to bulletin: {msg_path}")
 
         ## Attach rest of header with NULLs (if not long enough)