| Message ID | 20231120160548.2341315-1-lautrbach@redhat.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Petr Lautrbach |
| Headers | show |
| Series | sepolicy: port to dnf4 python API | expand |
On Mon, Nov 20, 2023 at 11:06 AM Petr Lautrbach <lautrbach@redhat.com> wrote: > > yum module is not available since RHEL 7. > > Drop -systemd related code as it's obsoleted these days - only 2 > packages ship their .service in -systemd subpackage > > Signed-off-by: Petr Lautrbach <lautrbach@redhat.com> Acked-by: James Carter <jwcart2@gmail.com> > --- > python/sepolicy/sepolicy/generate.py | 38 ++++++++++++---------------- > 1 file changed, 16 insertions(+), 22 deletions(-) > > diff --git a/python/sepolicy/sepolicy/generate.py b/python/sepolicy/sepolicy/generate.py > index b6df3e91160b..5aa71357f6a9 100644 > --- a/python/sepolicy/sepolicy/generate.py > +++ b/python/sepolicy/sepolicy/generate.py > @@ -1262,13 +1262,20 @@ allow %s_t %s_t:%s_socket name_%s; > return fcfile > > def __extract_rpms(self): > - import yum > - yb = yum.YumBase() > - yb.setCacheDir() > + import dnf > > - for pkg in yb.rpmdb.searchProvides(self.program): > + base = dnf.Base() > + base.read_all_repos() > + base.fill_sack(load_system_repo=True) > + > + query = base.sack.query() > + > + pq = query.available() > + pq = pq.filter(file=self.program) > + > + for pkg in pq: > self.rpms.append(pkg.name) > - for fname in pkg.dirlist + pkg.filelist + pkg.ghostlist: > + for fname in pkg.files: > for b in self.DEFAULT_DIRS: > if b == "/etc": > continue > @@ -1277,9 +1284,10 @@ allow %s_t %s_t:%s_socket name_%s; > self.add_file(fname) > else: > self.add_dir(fname) > - > - for bpkg in yb.rpmdb.searchNames([pkg.base_package_name]): > - for fname in bpkg.dirlist + bpkg.filelist + bpkg.ghostlist: > + sq = query.available() > + sq = sq.filter(provides=pkg.source_name) > + for bpkg in sq: > + for fname in bpkg.files: > for b in self.DEFAULT_DIRS: > if b == "/etc": > continue > @@ -1289,20 +1297,6 @@ allow %s_t %s_t:%s_socket name_%s; > else: > self.add_dir(fname) > > - # some packages have own systemd subpackage > - # tor-systemd for example > - binary_name = self.program.split("/")[-1] > - for bpkg in yb.rpmdb.searchNames(["%s-systemd" % binary_name]): > - for fname in bpkg.filelist + bpkg.ghostlist + bpkg.dirlist: > - for b in self.DEFAULT_DIRS: > - if b == "/etc": > - continue > - if fname.startswith(b): > - if os.path.isfile(fname): > - self.add_file(fname) > - else: > - self.add_dir(fname) > - > def gen_writeable(self): > try: > self.__extract_rpms() > -- > 2.41.0 >
On Mon, Nov 20, 2023 at 5:06 PM Petr Lautrbach <lautrbach@redhat.com> wrote: > > yum module is not available since RHEL 7. > > Drop -systemd related code as it's obsoleted these days - only 2 > packages ship their .service in -systemd subpackage > > Signed-off-by: Petr Lautrbach <lautrbach@redhat.com> > --- > python/sepolicy/sepolicy/generate.py | 38 ++++++++++++---------------- > 1 file changed, 16 insertions(+), 22 deletions(-) > > diff --git a/python/sepolicy/sepolicy/generate.py b/python/sepolicy/sepolicy/generate.py > index b6df3e91160b..5aa71357f6a9 100644 > --- a/python/sepolicy/sepolicy/generate.py > +++ b/python/sepolicy/sepolicy/generate.py > @@ -1262,13 +1262,20 @@ allow %s_t %s_t:%s_socket name_%s; > return fcfile > > def __extract_rpms(self): > - import yum > - yb = yum.YumBase() > - yb.setCacheDir() > + import dnf > > - for pkg in yb.rpmdb.searchProvides(self.program): > + base = dnf.Base() > + base.read_all_repos() > + base.fill_sack(load_system_repo=True) Aren't you forgetting to call base.close() at the end? Tip: in Python 3 you can use this syntax: with dnf.Base() as base: # do some work with 'base'... # when control flow exits the 'with' block, base.__exit__() is called # automatically, which calls base.close() > + > + query = base.sack.query() > + > + pq = query.available() > + pq = pq.filter(file=self.program) > + > + for pkg in pq: > self.rpms.append(pkg.name) > - for fname in pkg.dirlist + pkg.filelist + pkg.ghostlist: > + for fname in pkg.files: > for b in self.DEFAULT_DIRS: > if b == "/etc": > continue > @@ -1277,9 +1284,10 @@ allow %s_t %s_t:%s_socket name_%s; > self.add_file(fname) > else: > self.add_dir(fname) > - > - for bpkg in yb.rpmdb.searchNames([pkg.base_package_name]): > - for fname in bpkg.dirlist + bpkg.filelist + bpkg.ghostlist: > + sq = query.available() > + sq = sq.filter(provides=pkg.source_name) > + for bpkg in sq: > + for fname in bpkg.files: > for b in self.DEFAULT_DIRS: > if b == "/etc": > continue > @@ -1289,20 +1297,6 @@ allow %s_t %s_t:%s_socket name_%s; > else: > self.add_dir(fname) > > - # some packages have own systemd subpackage > - # tor-systemd for example > - binary_name = self.program.split("/")[-1] > - for bpkg in yb.rpmdb.searchNames(["%s-systemd" % binary_name]): > - for fname in bpkg.filelist + bpkg.ghostlist + bpkg.dirlist: > - for b in self.DEFAULT_DIRS: > - if b == "/etc": > - continue > - if fname.startswith(b): > - if os.path.isfile(fname): > - self.add_file(fname) > - else: > - self.add_dir(fname) > - > def gen_writeable(self): > try: > self.__extract_rpms() > -- > 2.41.0 >
diff --git a/python/sepolicy/sepolicy/generate.py b/python/sepolicy/sepolicy/generate.py index b6df3e91160b..5aa71357f6a9 100644 --- a/python/sepolicy/sepolicy/generate.py +++ b/python/sepolicy/sepolicy/generate.py @@ -1262,13 +1262,20 @@ allow %s_t %s_t:%s_socket name_%s; return fcfile def __extract_rpms(self): - import yum - yb = yum.YumBase() - yb.setCacheDir() + import dnf - for pkg in yb.rpmdb.searchProvides(self.program): + base = dnf.Base() + base.read_all_repos() + base.fill_sack(load_system_repo=True) + + query = base.sack.query() + + pq = query.available() + pq = pq.filter(file=self.program) + + for pkg in pq: self.rpms.append(pkg.name) - for fname in pkg.dirlist + pkg.filelist + pkg.ghostlist: + for fname in pkg.files: for b in self.DEFAULT_DIRS: if b == "/etc": continue @@ -1277,9 +1284,10 @@ allow %s_t %s_t:%s_socket name_%s; self.add_file(fname) else: self.add_dir(fname) - - for bpkg in yb.rpmdb.searchNames([pkg.base_package_name]): - for fname in bpkg.dirlist + bpkg.filelist + bpkg.ghostlist: + sq = query.available() + sq = sq.filter(provides=pkg.source_name) + for bpkg in sq: + for fname in bpkg.files: for b in self.DEFAULT_DIRS: if b == "/etc": continue @@ -1289,20 +1297,6 @@ allow %s_t %s_t:%s_socket name_%s; else: self.add_dir(fname) - # some packages have own systemd subpackage - # tor-systemd for example - binary_name = self.program.split("/")[-1] - for bpkg in yb.rpmdb.searchNames(["%s-systemd" % binary_name]): - for fname in bpkg.filelist + bpkg.ghostlist + bpkg.dirlist: - for b in self.DEFAULT_DIRS: - if b == "/etc": - continue - if fname.startswith(b): - if os.path.isfile(fname): - self.add_file(fname) - else: - self.add_dir(fname) - def gen_writeable(self): try: self.__extract_rpms()
yum module is not available since RHEL 7. Drop -systemd related code as it's obsoleted these days - only 2 packages ship their .service in -systemd subpackage Signed-off-by: Petr Lautrbach <lautrbach@redhat.com> --- python/sepolicy/sepolicy/generate.py | 38 ++++++++++++---------------- 1 file changed, 16 insertions(+), 22 deletions(-)