p3lib 1.1.79__tar.gz → 1.1.81__tar.gz

{p3lib-1.1.79 → p3lib-1.1.81}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: p3lib
-Version: 1.1.79
+Version: 1.1.81
 Summary: A group of python modules for networking, plotting data, config storage, automating boot scripts, ssh access and user input output.
 Home-page: https://github.com/pjaos/p3lib
 Author: Paul Austen

{p3lib-1.1.79 → p3lib-1.1.81}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = p3lib
-version = 1.1.79
+version = 1.1.81
 author = Paul Austen
 author_email = pausten.os@gmail.com
 description = A group of python modules for networking, plotting data, config storage, automating boot scripts, ssh access and user input output.

{p3lib-1.1.79 → p3lib-1.1.81}/src/p3lib/bokeh_auth.py

@@ -321,9 +321,9 @@ class CredentialsManager(object):
         username = self._uio.getInput('Enter the username: ')
         password = self._uio.getInput('Enter the password: ')
         if self.credentialsHasher.verify(username, password):
-            self._uio.info(f"The username and password match.")
+            self._uio.info("The username and password match.")
         else:
-            self._uio.error(f"The username and password do not match.")
+            self._uio.error("The username and password do not match.")
 
     def _showUsernames(self):
         """@brief Show the user a list of the usernames stored."""

{p3lib-1.1.79 → p3lib-1.1.81}/src/p3lib/boot_manager.py

@@ -15,7 +15,7 @@ class BootManager(object):
 
     LINUX_OS_NAME = "Linux"
 
-    def __init__(self, uio=None, allowRootUser=True):
+    def __init__(self, uio=None, allowRootUser=True, ensureRootUser=False):
         """@brief Constructor
            @param uio A UIO instance to display user output. If unset then no output
                   is displayed to user.
@@ -23,13 +23,14 @@ class BootManager(object):
                   programs. Note that as the BootManager is responsible for 
                   ensuring programs are started up when a machine boots up 
                   the installed program should be installed for the root 
-                  user on Linux systems."""
+                  user on Linux systems.
+           @param ensureRootUser If True the current user must be root user (Linux systems)."""
         self._uio = uio
         self._allowRootUser=allowRootUser
         self._osName = platform.system()
         self._platformBootManager = None
         if self._osName == BootManager.LINUX_OS_NAME:
-            self._platformBootManager = LinuxBootManager(uio, self._allowRootUser)
+            self._platformBootManager = LinuxBootManager(uio, self._allowRootUser, ensureRootUser)
         else:
             raise Exception("{} is an unsupported OS.".format(self._osName) )
 
@@ -97,16 +98,20 @@ class LinuxBootManager(object):
             raise Exception(f"{serviceFolder} folder not found.")
         return serviceFolder
 
-    def __init__(self, uio, allowRootUser):
+    def __init__(self, uio, allowRootUser, ensureRootUser):
         """@brief Constructor
            @param uio A UIO instance to display user output. If unset then no output is displayed to user.
-           @param allowRootUser If True then allow root user to to auto start programs."""
+           @param allowRootUser If True then allow root user to to auto start programs.
+           @param ensureRootUser If True the current user must be root user."""
         self._uio = uio
         self._logFile = None
         self._allowRootUser=allowRootUser
         self._info("OS: {}".format(platform.system()) )
         self._rootMode = False # If True run as root, else False.
         self._systemCtlBin = LinuxBootManager.GetSystemCTLBin()
+        if ensureRootUser and os.geteuid() != 0:
+            self._fatalError(self.__class__.__name__ + ": Not root user. Ensure that you are root user and try again.")
+
         if os.geteuid() == 0:
             if not allowRootUser:
                 self._fatalError(self.__class__.__name__ + f": You are running as root user but allowRootUser={allowRootUser}.")

{p3lib-1.1.79 → p3lib-1.1.81}/src/p3lib/pconfig.py

@@ -1,4 +1,4 @@
-#!/bin/sh/env python3d
+#!/bin/sh/env python3
 
 import  os
 import  base64
@@ -6,6 +6,7 @@ import  datetime
 import  sys
 import  json
 import  copy
+import  platform
 
 from    shutil import copyfile
 
@@ -313,31 +314,28 @@ class ConfigManager(object):
         if not cfgFilename:
             raise Exception("No config filename defined.")
 
-        cfgFilename = cfgFilename
         if addDotToFilename:
             if not cfgFilename.startswith("."):
 
                 cfgFilename=".%s" % (cfgFilename)
 
-            else:
-
-                cfgFilename=cfgFilename
-
         #The the config path has been set then use it
         if cfgPath:
             configPath = cfgPath
 
         else:
-            configPath=""
-            #If an absolute path is set for the config file then don't try to
-            #put the file in the users home dir
-            if not cfgFilename.startswith("/"):
-                configPath = expanduser("~")
-                configPath = configPath.strip()
-                #If no user is known then default to root user.
-                #This occurs on Omega2 startup apps.
-                if len(configPath) == 0 or configPath == '/' or configPath == '/root':
-                    configPath="/root"
+            # If the root user on a Linux system
+            if platform.system() == 'Linux' and os.geteuid() == 0:
+                # This should be the root users config folder.
+                configPath="/root"
+
+            else:
+                configPath=""
+                #If an absolute path is set for the config file then don't try to
+                #put the file in the users home dir
+                if not cfgFilename.startswith("/"):
+                    configPath = expanduser("~")
+                    configPath = configPath.strip()
 
         return join( configPath, cfgFilename )
 

{p3lib-1.1.79 → p3lib-1.1.81}/src/p3lib/table_plot.py

@@ -18,7 +18,6 @@ from    bokeh.layouts import gridplot, row, column
 from    bokeh.plotting import figure, ColumnDataSource
 from    bokeh.palettes import Category20
 from    bokeh.models import HoverTool, Div
-from    bokeh.models import DatetimeTickFormatter
 from    bokeh.models.widgets.buttons import Button
 from    bokeh.models.widgets import TextInput
 from    bokeh.plotting import output_file, save

{p3lib-1.1.79 → p3lib-1.1.81}/src/p3lib/uio.py

@@ -113,7 +113,7 @@ class UIO(object):
                 self._print('{}INFO{}:  {}'.format(UIO.GetInfoEscapeSeq(), UIO.DISPLAY_RESET_ESCAPE_SEQ, text))
         else:
             self._print('INFO:  {}'.format(text))
-        self._update_syslog(PRIORITY.INFO, text)
+        self._update_syslog(PRIORITY.INFO, "INFO:  "+text)
 
     def debug(self, text):
         """@brief Present a debug level message to the user if debuging is enabled.
@@ -128,7 +128,7 @@ class UIO(object):
                 self.storeToDebugLog('{}DEBUG{}: {}'.format(UIO.GetDebugEscapeSeq(), UIO.DISPLAY_RESET_ESCAPE_SEQ, text))
             else:
                 self.storeToDebugLog('DEBUG: {}'.format(text))
-        self._update_syslog(PRIORITY.DEBUG, text)
+        self._update_syslog(PRIORITY.DEBUG, "DEBUG: "+text)
 
     def warn(self, text):
         """@brief Present a warning level message to the user.
@@ -137,7 +137,7 @@ class UIO(object):
             self._print('{}WARN{}:  {}'.format(UIO.GetWarnEscapeSeq(), UIO.DISPLAY_RESET_ESCAPE_SEQ, text))
         else:
             self._print('WARN:  {}'.format(text))
-        self._update_syslog(PRIORITY.WARNING, text)
+        self._update_syslog(PRIORITY.WARNING, "WARN:  "+text)
 
     def error(self, text):
         """@brief Present an error level message to the user.
@@ -146,7 +146,7 @@ class UIO(object):
             self._print('{}ERROR{}: {}'.format(UIO.GetErrorEscapeSeq(), UIO.DISPLAY_RESET_ESCAPE_SEQ, text))
         else:
             self._print('ERROR: {}'.format(text))
-        self._update_syslog(PRIORITY.ERROR, text)
+        self._update_syslog(PRIORITY.ERROR, "ERROR: "+text)
 
     def _print(self, text):
         """@brief Print text to stdout"""
@@ -382,7 +382,10 @@ class UIO(object):
            @param syslogProgramName The name of the program that is being logged. If defined this appears after the username in the syslog output."""
         self._sysLogEnabled = enabled
         self._sysLogHost = host
-        self._syslogProgramName = programName
+        if programName:
+            self._syslogProgramName = programName
+        else:
+            self._syslogProgramName = sys.argv[0]
 
     def _update_syslog(self, pri, msg):
         """Send a message to syslog is syslog is enabled
@@ -398,7 +401,7 @@ class UIO(object):
         """
         if self._sysLogEnabled:
             aMsg=msg
-            #Ensure we have no zero characters in the message.
+            #Ensure we have no 0x00 characters in the message.
             # syslog will throw an error if it finds any
             if "\x00" in aMsg:
                 aMsg=aMsg.replace("\x00", "")

{p3lib-1.1.79 → p3lib-1.1.81}/src/p3lib.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: p3lib
-Version: 1.1.79
+Version: 1.1.81
 Summary: A group of python modules for networking, plotting data, config storage, automating boot scripts, ssh access and user input output.
 Home-page: https://github.com/pjaos/p3lib
 Author: Paul Austen