fix(py): audit funcs; ...

... fix(Lib/os): system,remove was func;
fix(py): builtins.id now uses ptr value for pointer type

Author: litlighilit

src/pylib/Lib/array.nim

@@ -11,6 +11,7 @@ import ../version
 import ../builtins/list
 import ../mutSeqSliceOp
 import ./collections/abc
+import ./sys_impl/auditImpl/macrohelper
 
 template since_has_Py_UCS4(def) =
   pysince(3, 13): def
@@ -395,10 +396,12 @@ macro array*(typecode: static[char], initializer: typed): PyArray =
   let
     typ = initializer.getTypeInst
     # not use getType, which returns concrete impl
+  result = newStmtWithAudit(
+    "array.__new__",  # sys.audit("array.__new__", typecode, initializer)
+    typecode.newLit, initializer)
   if typ.typeKind == ntyArray:
-    result = baseInitCall.add initializer.parseArrInitLit(typeStr)
+    result.add baseInitCall.add initializer.parseArrInitLit(typeStr)
     return
-  result = newStmtList()
   let res = genSym(nskVar, "arrayNewRes")
   result.add newVarStmt(
     res,

src/pylib/Lib/io.nim

@@ -45,6 +45,7 @@ export DefErrors, LookupError
 import ../pystring/[strimpl, strbltins]
 import ../pybytes/[bytesimpl, bytesbltins]
 import ./warnings
+import ./sys_impl/auditImpl as sys
 
 const
   SEEK_SET* = 0
@@ -675,6 +676,7 @@ template openImpl(result: untyped;
       encoding = encoding1, errors=errors1, newline=newline1, resMode=nmode)
   
   var nfile: File
+  sys.audit("open", file, smode)  ## XXX: PY-DIFF: 3rd arg shall be flags
   when file is int:
     let succ = openNoNonInhertFlag(nfile, FileHandle file, mode=nmode)
   else:

src/pylib/Lib/n_tempfile.nim

@@ -40,15 +40,18 @@ iterator items(self: var RandomNameSequence, times: int): string =
 
 const templ* = "tmp"  # Py's `tempfile.template`
 
-proc mktemp*(suffix="", prefix=templ, dir = "", checker=fileExists): string =
-  ## User-callable function to return a unique temporary file/dir name.  The
-  ##  file/dir is not created.
+proc mktempWithChecker(suffix="", prefix=templ, dir = "", checker: proc (s: string): bool=fileExists): string =
   for name in name_sequence.items(times=TMP_MAX):
     let file = dir / prefix & name & suffix
     if not checker file:
       return file
   raise newException(FileNotFoundError, "No usable temporary filename found")
 
+proc mktemp*(suffix="", prefix=templ, dir = ""): string =
+  ## User-callable function to return a unique temporary file/dir name.  The
+  ##  file/dir is not created.
+  mktempWithChecker(suffix, prefix, dir, fileExists)
+
 
 proc candidate_tempdir_list(): seq[string] =
     ##[Generate a list of candidate temporary directories which
@@ -259,9 +262,14 @@ type TemporaryDirectoryWrapper* = object
   name*: string
   ignore_cleanup_errors, delete: bool
 
+proc auditThenDirExists(s: string): bool =
+  sys.audit("tempfile.mkdtemp", s)
+  dirExists(s)
+
 proc mkdtemp*(suffix=sNone, prefix=sNone, dir=sNone): string =
   let tup = sanitize_params(prefix=prefix, suffix=suffix, dir=dir)
-  mktemp(dir=tup.dir, suffix=tup.suffix, prefix=tup.prefix, checker=dirExists)
+  mktempWithChecker(dir=tup.dir, suffix=tup.suffix, prefix=tup.prefix,
+    checker=auditThenDirExists)
 
 proc TemporaryDirectory*(suffix=sNone, prefix=sNone, dir=sNone, ignore_cleanup_errors=False,
      delete=True): TemporaryDirectoryWrapper =

src/pylib/Lib/os_impl/common.nim

@@ -1,5 +1,6 @@
 
 import ./private/defined_macros
+import ../sys_impl/auditImpl as sys
 export InJs
 import ../../pyerrors/[oserr, simperr, rterr]
 when defined(js):
@@ -14,7 +15,7 @@ import ../../pystring/[strimpl, strbltins]
 import ../../pybytes/[bytesimpl, bytesbltins]
 import ../../version
 export version
-
+export sys
 export io_abc, oserr, simperr, rterr, strimpl, strbltins.repr, bytesimpl, bytesbltins.repr
 export noneType
 

src/pylib/Lib/os_impl/listdirx.nim

@@ -4,6 +4,7 @@ import ./common
 import ./listcommon
 
 proc listdir*[T](p: PathLike[T] = "."): PyList[T] =
+  sys.audit("os.listdir", p)
   result = newPyList[T]()
   p.tryOsOp:
     for i in walkDir($p, relative=true, checkDir=true):

src/pylib/Lib/os_impl/posix_like/chmods.nim

@@ -83,6 +83,7 @@ proc chmod*(
   when not (HAVE_FCHMODAT or HAVE_FCHMOD or useMS_WINDOWSproc):
     if follow_symlinks_specified(follow_symlinks):
       return
+  sys.audit("os.chmod", path, mode, dir_fd)
   when useMS_WINDOWSproc:
     var res = false
     if path is int:
@@ -184,6 +185,7 @@ proc chmod*(
 
 when HAVE_FCHMOD or useMS_WINDOWSproc:
   proc fchmod*(fd: int, mode: int) =
+    sys.audit("os.chmod", fd, mode, -1)
     when useMS_WINDOWSproc:
       if not win32_fchmod(fd, mode):
         raiseErrno()
@@ -194,6 +196,7 @@ when HAVE_FCHMOD or useMS_WINDOWSproc:
 
 when HAVE_LCHMOD or useMS_WINDOWSproc:
   proc lchmod*(path: string, mode: int) =
+    sys.audit("os.chmod", path, mode, -1)
     when useMS_WINDOWSproc:
       if not win32_lchmod(newWideCString(path), mode):
         raiseErrnoWithPath path

src/pylib/Lib/os_impl/posix_like/links.nim

@@ -11,15 +11,15 @@ when InJs:
       res = readlinkSync(cstring p)
     $res
   proc symlinkSync(target, path, `type`: cstring){.importNode(fs, symlinkSync).}
-  proc symlink*[T](src, dst: PathLike[T], target_is_directory = false) =
+  proc symlinkImpl[T](src, dst: PathLike[T], target_is_directory = false) =
     catchJsErrAndRaise:
       symlinkSync(
         cstring $dst, cstring $dst,
         if target_is_directory: "dir" else: "file"
       )
 
   proc linkSync(target, path, `type`: cstring){.importNode(fs, linkSync).}
-  proc link*[T](src, dst: PathLike[T]) =
+  proc linkImpl[T](src, dst: PathLike[T]) =
     catchJsErrAndRaise:
       linkSync(
         cstring $dst, cstring $dst,
@@ -305,12 +305,20 @@ else:
       if c_symlinkat(src.cstring, dir_fd.cint, dst.cstring) != 0:
         raiseExcWithPath2(src, dst)
 
-  proc symlink*[T](src, dst: PathLike[T], target_is_directory = false) =
+  proc symlinkImpl[T](src, dst: PathLike[T], target_is_directory = false) =
     # std/os createSymlink on Windows will raise OSError if 
     # SYMBOLIC_LINK_FLAG_ALLOW_UNPRIVILEGED_CREATE is not supported yet
     if os_symlink_impl($src, $dst, target_is_directory):
       raiseExcWithPath2(src, dst)
 
-  proc link*[T](src, dst: PathLike[T]) =
+  proc linkImpl[T](src, dst: PathLike[T]) =
     tryOsOp(src, dst):
       createHardlink($src, $dst)
+
+proc symlink*[T](src, dst: PathLike[T], target_is_directory = false) =
+  sys.audit("os.symlink", src, dst, -1)
+  symlinkImpl(src, dst, target_is_directory)
+
+proc link*[T](src, dst: PathLike[T]) =
+  sys.audit("os.link", src, dst, -1, -1)
+  linkImpl(src, dst)

src/pylib/Lib/os_impl/posix_like/mkrmdir.nim

@@ -6,8 +6,12 @@ import ./mkrmdirImpl
 proc mkdir*(p: PathLike, mode=0o777, dir_fd: int){.error: "not implement".}
 proc rmdir*(p: PathLike, dir_fd: int){.error: "not implement".}
 
-proc rmdir*(path: PathLike) = rawRemoveDir(path)
-proc mkdir*(p: PathLike, mode=0o777) = rawCreateDir(p, mode)
+proc rmdir*(path: PathLike) =
+  sys.audit("os.rmdir", path, -1)
+  rawRemoveDir(path)
+proc mkdir*(p: PathLike, mode=0o777) =
+  sys.audit("os.mkdir", p, mode, -1)
+  rawCreateDir(p, mode)
 
 #[ A version of `mkdir` that does not support `mode` 
 proc mkdir*(p: PathLike, mode: int){.error: "not implement".}

src/pylib/Lib/os_impl/posix_like/open_close.nim

@@ -57,6 +57,7 @@ else:
 
 proc open*(path: PathLike, flags: int, mode=0o777, dir_fd = -1): int =
   ## `dir_fd` is ignored under Windows
+  sys.audit("open", path, mode, flags)
   when defined(js):
     var msg: string
     let

src/pylib/Lib/os_impl/posix_like/rename.nim

@@ -16,6 +16,7 @@ else:
     result = c_rename(cstring $src, cstring $dst) == 0.cint
 
 proc rename*[T](src, dst: PathLike[T]) =
+  sys.audit("os.rename", src, dst, -1, -1)
   if not internal_rename(src, dst, false):
     raiseExcWithPath2(src, dst)
 

src/pylib/Lib/os_impl/posix_like/scandirImpl.nim

@@ -135,6 +135,7 @@ when defined(js):
   proc readSync(self: Dir): Dirent{.importcpp.}
 
 template scandirImpl(path){.dirty.} =
+  sys.audit("os.scandir", path)
   let spath = $path
   when defined(js):
     var dir: Dir

src/pylib/Lib/os_impl/posix_like/truncate.nim

@@ -3,12 +3,12 @@ import ../common
 
 when defined(js):
   proc ftruncateSync(file: cint; len: cint){.importNode(fs, ftruncateSync).}
-  proc ftruncate*(file: Positive; length: int64) =
+  proc ftruncateImpl(file: Positive; length: Natural) =
     catchJsErrAndRaise ftruncateSync(file.cint, length.cint)
   proc truncateSync(file: cstring; len: cint){.importNode(fs, truncateSync).}
-  proc truncate*(file: CanIOOpenT; length: int64) =
+  proc truncateImpl(file: CanIOOpenT; length: Natural) =
     when file is int:
-      ftruncate file, length
+      ftruncateImpl file, length
     else:
       catchJsErrAndRaise truncateSync(file.cstring, length.cint)
 
@@ -21,24 +21,32 @@ else:
   else:
     import std/posix
 
-  template ftruncateImpl(file: Positive, length: int64): cint =
+  template ftruncateImplAux(file: Positive, length: int64): cint =
     when defined(windows):
       chsize_s(file.cint, length)
     else:
       posix.ftruncate(file.cint, length.Off)
 
-  proc ftruncate*(file: Positive, length: int64) =
-      let err = ftruncateImpl(file, length)
+  proc ftruncateImpl(file: Positive, length: int64) =
+      let err = ftruncateImplAux(file, length)
       if err.int != 0:
         raiseErrno err
 
-  proc truncate*(file: CanIOOpenT, length: Natural) =
+  proc truncateImpl(file: CanIOOpenT, length: Natural) =
     when file is int:
-      ftruncate file, length
+      ftruncateImpl file, length
     else:
       let fd = open(file, os.O_WDONLY)
       let err = ftruncateImpl(fd, length)
       if 0 != err:
         file.raiseErrnoWithPath err
       close(fd)
 
+proc ftruncate*(file: Positive, length: Natural) =
+  sys.audit("os.truncate", file, length)
+  ftruncateImpl(file, length)
+
+proc truncate*(file: CanIOOpenT, length: Natural) =
+  sys.audit("os.truncate", file, length)
+  truncateImpl(file, length)
+

src/pylib/Lib/os_impl/posix_like/unlink.nim

@@ -2,8 +2,10 @@
 import ./unlinkImpl
 
 
-proc unlink*[T](p: PathLike[T]) = unlinkImpl p
+proc unlink*[T](p: PathLike[T]) =
+  sys.audit("os.remove", p, -1)
+  unlinkImpl p
 
-func remove*[T](p: PathLike[T]) =
+proc remove*[T](p: PathLike[T]) =
   ## This function is semantically identical to `unlink`_
-  unlinkImpl(p)
+  unlink(p)

src/pylib/Lib/os_impl/posix_like/utime.nim

@@ -109,8 +109,10 @@ else:
       raiseExcWithPath path
 
 proc utime*[T; F: SomeFloat](path: PathLike[T], times: TimePair[F], follow_symlinks=true) =
+  sys.audit("os.utime", path, times, None, -1)
   utimeImpl stoTime, path, times, follow_symlinks
 proc utime*[T](path: PathLike[T], ns: TimeNsPair, follow_symlinks=true) =
+  sys.audit("os.utime", path, None, ns, -1)
   utimeImpl nstoTime, path, ns, follow_symlinks
 
 template timeToNs(t: times.Time): NsUnit = nowTime.toUnix.NsUnit * `ns/s` + nowTime.nanosecond.NsUnit
@@ -120,4 +122,5 @@ proc utime*[T](path: PathLike[T], follow_symlinks=true) =
     nowTime = times.getTime()
     ns = timeToNs nowTime
     times_tup = (ns, ns)
+  sys.audit("os.utime", path, None, times_tup, -1)
   utimeImpl nstoTime, path, times_tup, follow_symlinks

src/pylib/Lib/os_impl/subp.nim

@@ -1,9 +1,9 @@
 
-
+import ./common
 when not defined(js):
   proc c_system(cmd: cstring): cint{.importc: "system", header: "<stdlib.h>".}
 
-func system*(cmd: string): int{.discardable.} =
+proc system*(cmd: string): int{.discardable.} =
   ## os.system
   runnableExamples:
     const
@@ -12,6 +12,7 @@ func system*(cmd: string): int{.discardable.} =
       e2null = "echo 1 >" & mydevnull
     assert system(e2null) == 0
 
+  sys.audit("os.system", cmd)
   when defined(js):
     let jsStr = cmd.cstring
     var res: c_int

src/pylib/Lib/os_impl/utils.nim

@@ -12,12 +12,16 @@ when InJs:
   proc getcwd*(): PyStr = str cwd()
   proc getcwdb*(): PyBytes = bytes cwd()
   proc chdir(d: cstring){.importDenoOrProcess(chdir).}
-  proc chdir*(s: PathLike) = chdir cstring $s
+  proc chdirImpl(s: PathLike) = chdir cstring $s
 
 else:
   proc getcwd*(): PyStr = str getCurrentDir()
   proc getcwdb*(): PyBytes = bytes getCurrentDir()
-  proc chdir*(s: PathLike) = setCurrentDir $s
+  proc chdirImpl(s: PathLike) = setCurrentDir $s
+
+proc chdir*(s: PathLike) =
+  sys.audit("os.chdir", s)
+  chdirImpl(s)
 
 proc makedirs*[T](d: PathLike[T], mode=0o777, exists_ok=false) =
   let dir = $d

src/pylib/Lib/os_impl/walkImpl.nim

@@ -64,6 +64,7 @@ type ScanDir[T] = iterator (path: T): DirEntry[T]{.closure.}
 # translated from CPython-3.13-alpha/Lib/os.py L284
 iterator walk*[T](top: PathLike[T], topdown=True,
       onerror=shallIgnore, followlinks=False): WalkRes[T] =
+    sys.audit("os.walk", top, topdown, onerror, followlinks)
     var stack = newUnionList[T, WalkRes[T]]()
     stack.append(fspath(top))
       

src/pylib/Lib/resource_impl/funcs.nim

@@ -2,6 +2,7 @@
 import ./types
 import std/posix except EINVAL, EPERM
 import ../n_errno
+import ../sys_impl/auditImpl as sys
 import ../../pyerrors/oserr
 from ./csyms import HAVE_PRLIMIT, HAVE_GETPAGESIZE, HAVE_SYSCONF_PAGE_SIZE
 
@@ -63,8 +64,9 @@ proc setrlimitWrap(resource: int, rl: var RLimit) =
 template setrlimit*[T: py_rlimit_abc|py_rlimit](resource: int, limits: T) =
   ## this is defined as `template`.
   ## Because if being `proc`, py_rlimit_abc match cannot work
-  bind py2rlimit, setrlimitWrap
+  bind py2rlimit, setrlimitWrap, audit
   mixin len, `[]`
+  sys.audit("resource.setrlimit", resource, limits)
   var rl: RLimit
   py2rlimit(limits, rl)
   setrlimitWrap(resource, rl)
@@ -100,6 +102,7 @@ when HAVE_PRLIMIT:
     let
       tpid = Pid pid
       tresource = checked_resource(resource)
+    sys.audit("resource.prlimit", pid, resource, limits)
     var new_limit: RLimit
     py2rlimit(limits, new_limit)
     prlimitWrap(tpid, tresource, new_limit)

src/pylib/Lib/shutil.nim

@@ -20,6 +20,7 @@ proc get_terminal_size*(fallback=(80, 24)): terminal_size =
 import std/os
 when defined(posix):
   import std/posix
+import ./sys_impl/auditImpl as sys
 import ../pyerrors/oserr
 import ../io_abc
 
@@ -86,6 +87,7 @@ template copyFileImpl(src, dst: string; options: CopyFlag) =
 
 template copyGen(pyname, impl) =
   proc pyname*[T](src, dst: PathLike[T], follow_symlinks=true) =
+    sys.audit("shutil.copyfile", src, dst)
     let
       ssrc = $src
       sdst = $dst

src/pylib/Lib/signal_impl/unixs.nim

@@ -10,6 +10,7 @@ import ./[
   sigset_to_set,
   siginfo_decl
 ]
+import ../sys_impl/auditImpl as sys
 export Sigset
 export siginfo_decl except fill_siginfo
 import ../../Python/pytime/[deadline, pytimeFromSeconds, pytimeAsTimeval]
@@ -18,6 +19,7 @@ proc alarm*(seconds: int): int = int alarm seconds.cint
 proc pause*(): int = int posix.pause()
 
 proc pthread_kill*(thread_id: uint, signalnum: int) =
+  sys.audit("signal.pthread_kill", thread_id, signalnum)
   let err = pthread_kill(Pthread thread_id, cint signalnum)
   if err != 0:
     raiseErrno()