# HG changeset patch
# User jfp <jf.pieronne@laposte.net>
# Date 1733934716 -3600
# Wed Dec 11 17:31:56 2024 +0100
# Node ID 806096d776f712e17c17a3c3f0994c0ea855fe6d
# Parent c44aa6c462d21d3095133ef05c6c6697367670d6
Ruff updates
diff --git a/secrules/rules01.py b/secrules/rules01.py
--- a/secrules/rules01.py
+++ b/secrules/rules01.py
@@ -2,13 +2,10 @@
__version__ = '1.0'
# __all__ = ['rule1201', 'rule1202', 'rule1203']
-from .common import level_rule
+from ovms import dvidef, prvdef, syidef, uaidef, user
from ovms.rtl import lib
-from ovms import syidef, uaidef, prvdef, dvidef, ossdef
-from ovms import user
-from ovms import starlet
-from ovms import itemList
-from ovms import crtl
+
+from .common import level_rule
@level_rule(1)
@@ -209,7 +206,7 @@
for u in list(all_users.values()):
try:
lib.getdvi(dvidef.DVI__DEVNAM, None, u.defdev)
- except:
+ except OSError:
if ftm:
print('0106"3"', u.username.decode(), file=fo)
else:
@@ -232,7 +229,7 @@
for u in list(all_users.values()):
try:
lib.getdvi(dvidef.DVI__AVL, None, u.defdev)
- except:
+ except OSError:
if ftm:
print('0107"3"', u.username.decode(), file=fo)
else:
diff --git a/secrules/rules02.py b/secrules/rules02.py
--- a/secrules/rules02.py
+++ b/secrules/rules02.py
@@ -1,16 +1,12 @@
# -*- coding: iso-8859-1 -*-
__version__ = '1.0'
-from .common import level_rule
-import os, os.path
+from ovms import itemList, ossdef, ssdef, starlet
from ovms.rtl import lib
-from ovms import syidef, uaidef, prvdef, dvidef, ossdef, ssdef
-from ovms import user
-from ovms import starlet
-from ovms import itemList
-from ovms import crtl
from ovms.rtl.lib.FindFile import FindFile
+from .common import level_rule
+
VMSError = OSError
diff --git a/secrules/rules03.py b/secrules/rules03.py
--- a/secrules/rules03.py
+++ b/secrules/rules03.py
@@ -1,8 +1,9 @@
# -*- coding: iso-8859-1 -*-
__version__ = '1.0'
+from ovms.rtl.lib.FindFile import FindFile
+
from .common import level_rule
-from ovms.rtl.lib.FindFile import FindFile
from .get_security import get_security
diff --git a/secrules/rules04.py b/secrules/rules04.py
--- a/secrules/rules04.py
+++ b/secrules/rules04.py
@@ -1,14 +1,14 @@
# -*- coding: iso-8859-1 -*-
__version__ = '1.0'
-from .common import level_rule
+from ovms import dcdef, dvidef, dvsdef, itemList, ossdef, rms, rmsdef, ssdef, starlet
from ovms.rtl import lib
-from ovms import starlet
-from ovms import ossdef, ssdef, rmsdef, dvsdef, dcdef, dvidef, itemList
from ovms.rtl.lib.FindFile import FindFile
-from ovms import rms
+from ovms.starlet.DeviceScan import DeviceScan
+
from secrules import get_security
-from ovms.starlet.DeviceScan import DeviceScan
+
+from .common import level_rule
VMSError = OSError
@@ -104,7 +104,7 @@
while True:
try:
sts, device, devCtx, d = starlet.device_scan(b'*', devItm, devCtx)
- except:
+ except OSError:
break
if not lib.getdvi(dvidef.DVI__MNT, device_name=device)[1]:
continue
@@ -145,7 +145,7 @@
while True:
try:
sts, device, devCtx, d = starlet.device_scan(b'*', devItm, devCtx)
- except:
+ except OSError:
break
if not lib.getdvi(dvidef.DVI__MNT, device_name=device)[1]:
continue
@@ -308,7 +308,7 @@
while True:
try:
sts, device, devCtx, d = starlet.device_scan(b'*', devItm, devCtx)
- except:
+ except OSError:
break
if not lib.getdvi(dvidef.DVI__MNT, device_name=device)[1]:
continue
diff --git a/secrules/rules05.py b/secrules/rules05.py
--- a/secrules/rules05.py
+++ b/secrules/rules05.py
@@ -1,11 +1,10 @@
# -*- coding: iso-8859-1 -*-
__version__ = '1.0'
-from .common import level_rule
+from ovms import starlet, syidef, uaidef, user
from ovms.rtl import lib
-from ovms import syidef, uaidef
-from ovms import user
-from ovms import starlet
+
+from .common import level_rule
maxsysgroup = lib.getsyi(syidef.SYI__MAXSYSGROUP)[1]
all_users = None
diff --git a/secrules/rules06.py b/secrules/rules06.py
--- a/secrules/rules06.py
+++ b/secrules/rules06.py
@@ -1,14 +1,15 @@
# -*- coding: iso-8859-1 -*-
__version__ = '1.0'
+import os
+
+from ovms import syidef
+from ovms.rtl import lib
+from ovms.rtl.lib.FindFile import file_exists
+
from .common import level_rule
-import os
-from ovms import starlet
-from ovms.rtl import lib
-from ovms import syidef
from .DisplayProxy import DisplayProxy
from .user_exists import user_exists
-from ovms.rtl.lib.FindFile import FindFile, file_exists
maxsysgroup = lib.getsyi(syidef.SYI__MAXSYSGROUP)[1]
@@ -71,9 +72,9 @@
local_users_str,
file=fo,
)
- for l in local_users:
- if (l != b'*') and (l != b''):
- if user_exists(l)[0] is None:
+ for usr in local_users:
+ if (usr != b'*') and (usr != b''):
+ if user_exists(usr)[0] is None:
if fmt:
print(
'0602',
@@ -86,7 +87,7 @@
'2',
proxy_node.decode(),
proxy_user.decode(),
- l.decode(),
+ usr.decode(),
file=fo,
)
print(
@@ -128,8 +129,8 @@
default_user.decode(),
file=fo,
)
- for l in local_users:
- if (l != b'*') and (l != b''):
+ for usr in local_users:
+ if (usr != b'*') and (usr != b''):
g, m = user_exists(local_users)
if (g is not None) and (g <= maxsysgroup):
if fmt:
@@ -140,7 +141,7 @@
print(
proxy_node.decode(),
proxy_user.decode(),
- l.decode(),
+ usr.decode(),
file=fo,
)
diff --git a/secrules/rules07.py b/secrules/rules07.py
--- a/secrules/rules07.py
+++ b/secrules/rules07.py
@@ -1,15 +1,14 @@
# -*- coding: iso-8859-1 -*-
__version__ = '1.0'
-from .common import level_rule
-from ovms import starlet
+from ovms import dcdef, dvidef, itemList, ossdef, ssdef, starlet
from ovms.rtl import lib
-from ovms import ssdef, kgbdef, ossdef, dcdef, dvidef
-from ovms import itemList
-from secrules import get_security
-from secrules import user_exists
from ovms.starlet.DeviceScan import DeviceScan
+from secrules import get_security, user_exists
+
+from .common import level_rule
+
VMSError = OSError
ids = (
diff --git a/secrules/rules08.py b/secrules/rules08.py
--- a/secrules/rules08.py
+++ b/secrules/rules08.py
@@ -1,10 +1,9 @@
# -*- coding: iso-8859-1 -*-
__version__ = '1.0'
+from ovms import uaidef, user
+
from .common import level_rule
-from ovms import starlet
-from ovms import user
-from ovms import uaidef
@level_rule(1)
diff --git a/secrules/rules09.py b/secrules/rules09.py
--- a/secrules/rules09.py
+++ b/secrules/rules09.py
@@ -1,14 +1,14 @@
# -*- coding: iso-8859-1 -*-
__version__ = '1.0'
-from .common import level_rule
import os
-from ovms import starlet
+
+from ovms import itemList, ossdef, starlet
from ovms.rtl import lib
-from ovms import itemList
-from ovms import ossdef
from ovms.rtl.lib.FindFile import FindFile, file_exists
+from .common import level_rule
+
@level_rule(2)
def rule0901(fo, fmt):
@@ -19,10 +19,10 @@
can allow unauthorized users to modify their own or another user's execution
environment."""
- ebit = 0x4
+ # ebit = 0x4
wbit = 0x2
dbit = 0x8
- rbit = 0x1
+ # rbit = 0x1
if not fmt:
print(file=fo)
diff --git a/secrules/rules10.py b/secrules/rules10.py
--- a/secrules/rules10.py
+++ b/secrules/rules10.py
@@ -1,8 +1,9 @@
# -*- coding: iso-8859-1 -*-
__version__ = '1.0'
+import os
+
from .common import level_rule
-import os
@level_rule(2)
diff --git a/secrules/rules11.py b/secrules/rules11.py
--- a/secrules/rules11.py
+++ b/secrules/rules11.py
@@ -1,15 +1,13 @@
# -*- coding: iso-8859-1 -*-
__version__ = '1.0'
-from .common import level_rule
import os
-from ovms import starlet
+
+from ovms import itemList, ossdef, prvdef, starlet, syidef, uaidef, user
from ovms.rtl import lib
-from ovms import user
-from ovms import ossdef, uaidef, syidef, prvdef
-from ovms import itemList
-from ovms.rtl.lib.FindFile import FindFile
from ovms.rtl.lib.FindFile import file_exists
+
+from .common import level_rule
from .getMailObjectInfo import getMailObjectInfo
diff --git a/secrules/rules12.py b/secrules/rules12.py
--- a/secrules/rules12.py
+++ b/secrules/rules12.py
@@ -1,9 +1,10 @@
# -*- coding: iso-8859-1 -*-
__version__ = '1.0'
-from .common import level_rule
+from ovms import queues, quidef
from ovms.rtl import lib
-from ovms import queues, quidef
+
+from .common import level_rule
accname = lib.get_accnam('QUEUE')[1]
diff --git a/secrules/rules13.py b/secrules/rules13.py
--- a/secrules/rules13.py
+++ b/secrules/rules13.py
@@ -1,14 +1,12 @@
# -*- coding: iso-8859-1 -*-
__version__ = '1.0'
-from .common import level_rule
-from ovms import starlet
+from ovms import itemList, ossdef, rmsdef, ssdef, starlet, uaidef, user
from ovms.rtl import lib
-from ovms import user
-from ovms import rmsdef, ossdef, ssdef, uaidef
-from ovms import itemList
from ovms.rtl.lib.FindFile import FindFile, file_exists
+from .common import level_rule
+
VMSError = OSError
diff --git a/secrules/rules14.py b/secrules/rules14.py
--- a/secrules/rules14.py
+++ b/secrules/rules14.py
@@ -1,11 +1,13 @@
# -*- coding: iso-8859-1 -*-
+import os
from typing import Tuple
+
+from ovms import rms, rmsdef
+from ovms.rtl.lib import FindFile
+
from .common import level_rule
-import os
-from ovms.rtl.lib import FindFile
-from ovms import rms
-from ovms import rmsdef
+
__version__ = '1.0'
@@ -87,31 +89,30 @@
auth = None
hasPriv = False
instr = False
- state = 0
- for l in r:
- if l == '':
+ for ln in r:
+ if ln == '':
continue
- if l[0] != ' ':
- dspec = l.replace('.000000', '')
+ if ln[0] != ' ':
+ dspec = ln.replace('.000000', '')
fspec = ''
- elif ';' in l:
+ elif ';' in ln:
priv = auth = None
hasPriv = False
- l = l.split()
- fspec = l[0]
- instr = len(l) > 1
+ ln = ln.split()
+ fspec = ln[0]
+ instr = len(ln) > 1
if instr:
- l = l[1:]
- if 'Prv' in l:
+ ln = ln[1:]
+ if 'Prv' in ln:
hasPriv = True
elif not instr:
- l = l.split()
- if 'Prv' in l:
+ ln = ln.split()
+ if 'Prv' in ln:
hasPriv = True
- elif 'Privileges = ' in l:
- priv = l
- elif 'Authorized = ' in l:
- auth = l
+ elif 'Privileges = ' in ln:
+ priv = ln
+ elif 'Authorized = ' in ln:
+ auth = ln
with FindFile.FindFile(
fspec.encode(), dspec.encode()
) as fi: # type: ignore
diff --git a/secrules/rules15.py b/secrules/rules15.py
--- a/secrules/rules15.py
+++ b/secrules/rules15.py
@@ -1,8 +1,8 @@
# -*- coding: iso-8859-1 -*-
+import os
+
from .common import level_rule
-import os
-from ovms.rtl.lib import FindFile
__version__ = '1.0'
@@ -16,12 +16,12 @@
with os.popen('TCPIP SHOW SERVICES') as p:
r = [x[:-1].rstrip() for x in p]
- for l in r:
- if l == '':
+ for ln in r:
+ if ln == '':
continue
- if l[:7] == 'Service':
+ if ln[:7] == 'Service':
continue
- s = l.split()
+ s = ln.split()
if s[0] in 'FINGER,FTP,RLOGIN,SNMP,TELNET,REXEC,RSH':
if s[5] == '0.0.0.0':
v = '%s %s' % (s[0], s[6])