v5.25 file encryption added, logrotate fixed

ColumPaget · Aug 31, 2024 · bb9719a · bb9719a
1 parent df6fe3f
commit bb9719a
Show file tree

Hide file tree

Showing 29 changed files with 2,311 additions and 2,636 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,10 @@
+v5.25 (2024-08-31)
+  * Symmetric Encryption now supported for STREAMs
+  * Handle situation where logfile is rotated under an app that has it open
+  * Stop trying to rotate hardened logfiles. rotate is incompatible with append-only files
+
 v5.24 (2024-08-20)
-  * Move namespace/container code to Containers.c and make general improvments
+  * Move namespace/container code to Containers.c and make general improvements
   * Exit out of TerminalReadText if escape or ctrl-c entered
   * Added 'l' option (list files on remote server) to SSH streams
   * CHANGED ARGUMENTS TO SSHConnect AND SSHOpen

diff --git a/Compression.c b/Compression.c
@@ -155,7 +155,7 @@ int zlibProcessorClose(TProcessingModule *ProcMod)
 #define COMP_ZLIB 0
 #define COMP_GZIP 1
 
-int zlibProcessorInit(TProcessingModule *ProcMod, const char *Args)
+int zlibProcessorInit(TProcessingModule *ProcMod, const char *Args, unsigned char **Header, int *HeadLen)
 {
     int result=FALSE;
 
@@ -219,7 +219,7 @@ int CompressBytes(char **Out, const char *Alg, const char *In, unsigned long Len
     int result;
 
     Tempstr=FormatStr(Tempstr,"CompressionLevel=%d",Level);
-    Mod=StandardDataProcessorCreate("compress",Alg,Tempstr);
+    Mod=StandardDataProcessorCreate("compress",Alg,Tempstr, NULL, NULL);
     if (! Mod) return(-1);
 
     val=Len *2;
@@ -239,7 +239,7 @@ int DeCompressBytes(char **Out, const char *Alg, const char *In, unsigned long L
     int result;
     unsigned long val;
 
-    Mod=StandardDataProcessorCreate("decompress",Alg,"");
+    Mod=StandardDataProcessorCreate("decompress",Alg,"",NULL, NULL);
     if (! Mod) return(-1);
 
     val=Len *2;

diff --git a/Compression.h b/Compression.h
@@ -52,7 +52,7 @@ The return value of Both CompressBytes and DecompressBytes is the length of data
 extern "C" {
 #endif
 
-int zlibProcessorInit(TProcessingModule *ProcMod, const char *Args);
+int zlibProcessorInit(TProcessingModule *ProcMod, const char *Args, unsigned char **Header, int *HeadLen);
 int CompressBytes(char **Out, const char *Alg, const char *In, unsigned long Len, int Level);
 int DeCompressBytes(char **Out, const char *Alg, const char *In, unsigned long Len);
 

diff --git a/Container.c b/Container.c
@@ -3,8 +3,8 @@
 #include <glob.h>
 
 #ifdef HAVE_UNSHARE
-       #define _GNU_SOURCE
-       #include <sched.h>
+#define _GNU_SOURCE
+#include <sched.h>
 #endif
 
 static void InitSigHandler(int sig)
@@ -229,19 +229,19 @@ static void ContainerNamespace(const char *Namespace, const char *HostName, int
 
 static void ContainerSetHostname(const char *Namespace, const char *HostName)
 {
-int val, result;
+    int val, result;
 
 #ifdef HAVE_UNSHARE
 #ifdef CLONE_NEWUTS
-        if (StrValid(Namespace)) ContainerJoinNamespace(Namespace, CLONE_NEWUTS);
-        else
-        {
-            unshare(CLONE_NEWUTS);
-            val=StrLen(HostName);
-            if (val != 0) result=sethostname(HostName, val);
-            else result=sethostname("container", 9);
-            if (result != 0) RaiseError(ERRFLAG_ERRNO, "ContainerNamespace", "Failed to sethostname for container.");
-        }
+    if (StrValid(Namespace)) ContainerJoinNamespace(Namespace, CLONE_NEWUTS);
+    else
+    {
+        unshare(CLONE_NEWUTS);
+        val=StrLen(HostName);
+        if (val != 0) result=sethostname(HostName, val);
+        else result=sethostname("container", 9);
+        if (result != 0) RaiseError(ERRFLAG_ERRNO, "ContainerNamespace", "Failed to sethostname for container.");
+    }
 #endif
 #else
     RaiseError(0, "namespaces", "containers/unshare unavailable");
@@ -286,7 +286,7 @@ static pid_t ContainerLaunchInit(int Flags, const char *Dir)
     child=fork();
     if (child == 0)
     {
-				setsid();
+        setsid();
         child=fork();
         if (child !=0)
         {
@@ -428,7 +428,7 @@ int ContainerApplyConfig(const char *Config)
 
 
         if (Flags & PROC_CONTAINER_PID) ContainerUnsharePID(Flags, Namespace, Dir);
-				if (StrValid(HostName)) ContainerSetHostname(Namespace, HostName);
+        if (StrValid(HostName)) ContainerSetHostname(Namespace, HostName);
 
         //ContainerNamespace(Namespace, HostName, Flags);