Compare commits

...

No commits in common. "c8" and "imports/c8s/oscap-anaconda-addon-1.2.1-10.el8" have entirely different histories.

5 changed files with 27 additions and 403 deletions

View File

@ -0,0 +1 @@
9ddad97065dcdcaa475051ad576cd9f2e9a5a2cc SOURCES/oscap-anaconda-addon-1.2.1.tar.gz

View File

@ -1,9 +1,9 @@
diff -U3 -N -r a/po/de.po b/po/de.po
--- a/po/de.po 2021-07-30 15:17:14.000000000 +0200
+++ b/po/de.po 2023-07-19 13:30:03.838518879 +0200
+++ b/po/de.po 2022-07-20 13:28:31.143478128 +0200
@@ -1,11 +1,12 @@
# Ludek Janda <ljanda@redhat.com>, 2019. #zanata, 2021.
+# Ettore Atalan <atalanttore@googlemail.com>, 2021, 2022.
+# Ettore Atalan <atalanttore@googlemail.com>, 2021.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
@ -11,7 +11,7 @@ diff -U3 -N -r a/po/de.po b/po/de.po
"POT-Creation-Date: 2021-06-21 11:51+0200\n"
-"PO-Revision-Date: 2021-07-13 13:04+0000\n"
-"Last-Translator: Ludek Janda <ljanda@redhat.com>\n"
+"PO-Revision-Date: 2022-12-24 15:19+0000\n"
+"PO-Revision-Date: 2021-12-28 22:16+0000\n"
+"Last-Translator: Ettore Atalan <atalanttore@googlemail.com>\n"
"Language-Team: German <https://translate.fedoraproject.org/projects/"
"oscap-anaconda-addon/rhel8-branch/de/>\n"
@ -21,7 +21,7 @@ diff -U3 -N -r a/po/de.po b/po/de.po
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.7.1\n"
+"X-Generator: Weblate 4.15\n"
+"X-Generator: Weblate 4.10.1\n"
#: ../org_fedora_oscap/common.py:326
#, python-brace-format
@ -34,64 +34,9 @@ diff -U3 -N -r a/po/de.po b/po/de.po
#: ../org_fedora_oscap/data_fetch.py:262
#, python-brace-format
@@ -328,12 +329,10 @@
msgstr "Wählen Sie unten ein Profil:"
#: tmp/oscap.glade.h:7
-#, fuzzy
msgid "Profile"
msgstr "Profil"
#: tmp/oscap.glade.h:8
-#, fuzzy
msgid "Selected"
msgstr "Ausgewählt"
diff -U3 -N -r a/po/fi.po b/po/fi.po
--- a/po/fi.po 2021-07-30 15:17:14.000000000 +0200
+++ b/po/fi.po 2023-07-19 13:30:03.838518879 +0200
@@ -1,7 +1,7 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
-# Ricky Tigg <ricky.tigg@gmail.com>, 2021.
+# Ricky Tigg <ricky.tigg@gmail.com>, 2021, 2022.
# Robin Lahtinen <robin.lahtinen@gmail.com>, 2021.
# Jan Kuparinen <copper_fin@hotmail.com>, 2021.
msgid ""
@@ -9,8 +9,8 @@
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-06-21 11:51+0200\n"
-"PO-Revision-Date: 2021-07-02 12:16+0000\n"
-"Last-Translator: Jan Kuparinen <copper_fin@hotmail.com>\n"
+"PO-Revision-Date: 2022-11-10 17:19+0000\n"
+"Last-Translator: Ricky Tigg <ricky.tigg@gmail.com>\n"
"Language-Team: Finnish <https://translate.fedoraproject.org/projects/"
"oscap-anaconda-addon/rhel8-branch/fi/>\n"
"Language: fi\n"
@@ -18,7 +18,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.7.1\n"
+"X-Generator: Weblate 4.14.2\n"
#: ../org_fedora_oscap/common.py:326
#, python-brace-format
@@ -61,7 +61,8 @@
#, python-format
msgid ""
"mount option '%(mount_option)s' added for the mount point %(mount_point)s"
-msgstr "Liitoskohta '%(mount_option)s' lisätty liitoskohtaan %(mount_point)s"
+msgstr ""
+"Liitosvaihtoehto '%(mount_option)s' lisätty liitospisteeseen %(mount_point)s"
#. root password was not set
#: ../org_fedora_oscap/rule_handling.py:554
diff -U3 -N -r a/po/fr.po b/po/fr.po
--- a/po/fr.po 2021-07-30 15:17:14.000000000 +0200
+++ b/po/fr.po 2023-07-19 13:30:03.838518879 +0200
+++ b/po/fr.po 2022-07-20 13:28:31.143478128 +0200
@@ -8,45 +8,47 @@
# Ludek Janda <ljanda@redhat.com>, 2018. #zanata
# Ludek Janda <ljanda@redhat.com>, 2019. #zanata
@ -199,7 +144,7 @@ diff -U3 -N -r a/po/fr.po b/po/fr.po
#: ../org_fedora_oscap/gui/spokes/oscap.py:201
diff -U3 -N -r a/po/hr.po b/po/hr.po
--- a/po/hr.po 1970-01-01 01:00:00.000000000 +0100
+++ b/po/hr.po 2023-07-19 13:30:03.838518879 +0200
+++ b/po/hr.po 2022-07-20 13:28:31.143478128 +0200
@@ -0,0 +1,329 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
@ -530,99 +475,20 @@ diff -U3 -N -r a/po/hr.po b/po/hr.po
+#: tmp/oscap.glade.h:13
+msgid "_Fetch"
+msgstr "_Preuzmi"
diff -U3 -N -r a/po/hu.po b/po/hu.po
--- a/po/hu.po 2021-07-30 15:17:14.000000000 +0200
+++ b/po/hu.po 2023-07-19 13:30:03.838518879 +0200
@@ -7,21 +7,23 @@
# Teknős Ferenc <teknos.ferenc@gmail.com>, 2018. #zanata
# Teknős Ferenc <teknos.ferenc@gmail.com>, 2019. #zanata
# Teknős Ferenc <teknos.ferenc@gmail.com>, 2020. #zanata
+# Hoppár Zoltán <hopparz@gmail.com>, 2022.
+# Dankaházi (ifj.) István <dankahazi.istvan@gmail.com>, 2023.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-06-21 11:51+0200\n"
-"PO-Revision-Date: 2020-03-29 01:40-0400\n"
-"Last-Translator: Teknős Ferenc <teknos.ferenc@gmail.com>\n"
-"Language-Team: Hungarian (http://www.transifex.com/projects/p/oscap-anaconda-"
-"addon/language/hu/)\n"
+"PO-Revision-Date: 2023-05-12 16:20+0000\n"
+"Last-Translator: Dankaházi (ifj.) István <dankahazi.istvan@gmail.com>\n"
+"Language-Team: Hungarian <https://translate.fedoraproject.org/projects/"
+"oscap-anaconda-addon/rhel8-branch/hu/>\n"
"Language: hu\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Zanata 4.6.2\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.15.2\n"
#: ../org_fedora_oscap/common.py:326
#, python-brace-format
@@ -129,7 +131,7 @@
"service '%s' has been added to the list of services to be added to the "
"firewall"
msgstr ""
-"szolgáltatás \"%s\" lett hozzáadva a tűzfalhoz hozzáadandó szolgáltatások "
+"\"%s\" szolgáltatás lett hozzáadva a tűzfalhoz hozzáadandó szolgáltatások "
"listájához"
#: ../org_fedora_oscap/rule_handling.py:1010
@@ -137,7 +139,7 @@
#, python-format
msgid ""
"port '%s' has been added to the list of ports to be added to the firewall"
-msgstr "port \"%s\" lett hozzáadva a tűzfalhoz hozzáadandó portok listájához"
+msgstr "\"%s\" port lett hozzáadva a tűzfalhoz hozzáadandó portok listájához"
#: ../org_fedora_oscap/rule_handling.py:1017
#: ../org_fedora_oscap/rule_handling.py:1068
@@ -194,7 +196,7 @@
#. title of the spoke (will be displayed on the hub)
#: ../org_fedora_oscap/gui/spokes/oscap.py:201
msgid "_Security Policy"
-msgstr "_Biztonsági házirend"
+msgstr "_Biztonsági szabályzat"
#. the first status provided
#: ../org_fedora_oscap/gui/spokes/oscap.py:229
@@ -220,8 +222,7 @@
#: ../org_fedora_oscap/gui/spokes/oscap.py:790
msgid "Invalid or unsupported content URL, please enter a different one."
-msgstr ""
-"Érvénytelen vagy nem támogatott tartalom URL, kérjük, írjon be másikat."
+msgstr "Érvénytelen vagy nem támogatott URL tartalom, kérjük, írjon be másikat."
#: ../org_fedora_oscap/gui/spokes/oscap.py:798
msgid "Failed to fetch content. Enter a different URL, please."
@@ -263,7 +264,7 @@
#. available
#: ../org_fedora_oscap/gui/spokes/oscap.py:887
msgid " or enter data stream content or archive URL below:"
-msgstr "vagy adjon meg adathalmazt, vagy archiv URL-t alább:"
+msgstr " vagy adjon meg adathalmazt, vagy archiv URL-t alább:"
#: ../org_fedora_oscap/gui/spokes/oscap.py:891 tmp/oscap.glade.h:12
msgid ""
diff -U3 -N -r a/po/ja.po b/po/ja.po
--- a/po/ja.po 2021-07-30 15:17:14.000000000 +0200
+++ b/po/ja.po 2023-07-19 13:30:03.838518879 +0200
+++ b/po/ja.po 2022-07-20 13:28:31.143478128 +0200
@@ -1,6 +1,6 @@
-# Ludek Janda <ljanda@redhat.com>, 2017. #zanata
-# Ludek Janda <ljanda@redhat.com>, 2018. #zanata
-# Ludek Janda <ljanda@redhat.com>, 2020. #zanata
+# Ludek Janda <ljanda@redhat.com>, 2017. #zanata, 2021, 2022.
+# Ludek Janda <ljanda@redhat.com>, 2018. #zanata, 2021, 2022.
+# Ludek Janda <ljanda@redhat.com>, 2020. #zanata, 2021, 2022.
+# Ludek Janda <ljanda@redhat.com>, 2017. #zanata, 2021.
+# Ludek Janda <ljanda@redhat.com>, 2018. #zanata, 2021.
+# Ludek Janda <ljanda@redhat.com>, 2020. #zanata, 2021.
# Sundeep Anand <suanand@redhat.com>, 2021.
# simmon <simmon@nplob.com>, 2021.
msgid ""
@@ -8,38 +8,38 @@
@@ -8,38 +8,37 @@
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-06-21 11:51+0200\n"
@ -630,8 +496,8 @@ diff -U3 -N -r a/po/ja.po b/po/ja.po
-"Last-Translator: simmon <simmon@nplob.com>\n"
-"Language-Team: Japanese <https://translate.fedoraproject.org/projects/oscap-"
-"anaconda-addon/rhel8-branch/ja/>\n"
+"PO-Revision-Date: 2022-11-02 07:19+0000\n"
+"Last-Translator: Ludek Janda <ljanda@redhat.com>\n"
+"PO-Revision-Date: 2021-08-20 09:04+0000\n"
+"Last-Translator: Sundeep Anand <suanand@redhat.com>\n"
+"Language-Team: Japanese <https://translate.fedoraproject.org/projects/"
+"oscap-anaconda-addon/rhel8-branch/ja/>\n"
"Language: ja\n"
@ -640,7 +506,7 @@ diff -U3 -N -r a/po/ja.po b/po/ja.po
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 4.5.3\n"
+"X-Generator: Weblate 4.14.1\n"
+"X-Generator: Weblate 4.7.2\n"
#: ../org_fedora_oscap/common.py:326
#, python-brace-format
@ -655,8 +521,7 @@ diff -U3 -N -r a/po/ja.po b/po/ja.po
msgid ""
"Integrity check of the content failed - {hash_obj.name} hash didn't match"
-msgstr "コンテンツの整合性チェックに失敗しました。コンテンツを使用できません。"
+msgstr "コンテンツの整合性チェックに失敗しました。{hash_obj.name} "
+"ハッシュが一致しませんでした"
+msgstr "コンテンツの整合性チェックに失敗しました。{hash_obj.name} ハッシュが一致しませんでした"
#: ../org_fedora_oscap/data_fetch.py:117
msgid "Network connection needed to fetch data."
@ -672,68 +537,7 @@ diff -U3 -N -r a/po/ja.po b/po/ja.po
#: ../org_fedora_oscap/rule_handling.py:434
#, python-brace-format
@@ -48,18 +48,17 @@
"in the partitioning layout before installation can occur with a security "
"profile"
msgstr ""
-"{0} は、別のパーティションもしくは論理ボリューム上になければなりません。ま"
-"た、セキュリティープロファイルがインストールされる前にパーティションレイアウ"
-"トに作成されなければなりません"
+"{0} は、別のパーティションもしくは論理ボリューム上になければなりません。また"
+"、セキュリティープロファイルがインストールされる前にパーティションレイアウト"
+"に作成されなければなりません"
#. template for the message
#: ../org_fedora_oscap/rule_handling.py:445
#, python-format
msgid ""
"mount option '%(mount_option)s' added for the mount point %(mount_point)s"
-msgstr ""
-"マウントオプション '%(mount_option)s' が、マウントポイント %(mount_point)s に"
-"追加されました"
+msgstr "マウントオプション '%(mount_option)s' が、マウントポイント %(mount_point)s "
+"に追加されました"
#. root password was not set
#: ../org_fedora_oscap/rule_handling.py:554
@@ -92,8 +91,8 @@
"can't be removed from the current software selection without breaking the "
"installation."
msgstr ""
-"パッケージ ' {package}' が除外パッケージのリストに追加されましたが、インス"
-"トールを中断せずに現在のソフトウェアの選択から削除することはできません。"
+"パッケージ ' {package}' が除外パッケージのリストに追加されましたが、インスト"
+"ールを中断せずに現在のソフトウェアの選択から削除することはできません。"
#: ../org_fedora_oscap/rule_handling.py:717
#: ../org_fedora_oscap/rule_handling.py:732
@@ -123,8 +122,7 @@
msgid ""
"service '%s' has been added to the list of services to be added to the "
"firewall"
-msgstr ""
-"サービス '%s' が、ファイアウォールに追加予定のサービス一覧に追加されました"
+msgstr "サービス '%s' が、ファイアウォールに追加予定のサービス一覧に追加されました"
#: ../org_fedora_oscap/rule_handling.py:1010
#: ../org_fedora_oscap/rule_handling.py:1055
@@ -138,8 +136,7 @@
#, python-format
msgid ""
"trust '%s' has been added to the list of trusts to be added to the firewall"
-msgstr ""
-"トラスト '%s' が、ファイアウォールに追加予定のトラスト一覧に追加されました"
+msgstr "トラスト '%s' が、ファイアウォールに追加予定のトラスト一覧に追加されました"
#: ../org_fedora_oscap/rule_handling.py:1080
#: ../org_fedora_oscap/rule_handling.py:1095
@@ -147,44 +144,37 @@
msgid ""
"service '%s' has been added to the list of services to be removed from the "
"firewall"
-msgstr ""
-"サービス '%s' が、ファイアウォールから削除予定のサービス一覧に追加されました"
+msgstr "サービス '%s' が、ファイアウォールから削除予定のサービス一覧に追加されました"
@@ -152,39 +151,33 @@
#: ../org_fedora_oscap/ks/oscap.py:376
msgid "The installation should be aborted."
@ -780,64 +584,9 @@ diff -U3 -N -r a/po/ja.po b/po/ja.po
#. the first status provided
#: ../org_fedora_oscap/gui/spokes/oscap.py:229
@@ -210,9 +200,8 @@
#: ../org_fedora_oscap/gui/spokes/oscap.py:790
msgid "Invalid or unsupported content URL, please enter a different one."
-msgstr ""
-"コンテンツ URL が無効またはサポートされていません。別の URL を入力していませ"
-"ん。"
+msgstr "コンテンツ URL が無効またはサポートされていません。別の URL "
+"を入力していません。"
#: ../org_fedora_oscap/gui/spokes/oscap.py:798
msgid "Failed to fetch content. Enter a different URL, please."
@@ -222,8 +211,7 @@
msgid ""
"Network error encountered when fetching data. Please check that network is "
"setup and working."
-msgstr ""
-"データの取得時にネットワークエラーが発生しました。ネットワークが設定されてお"
+msgstr "データの取得時にネットワークエラーが発生しました。ネットワークが設定されてお"
"り、動作していることを確認してください。"
#: ../org_fedora_oscap/gui/spokes/oscap.py:815
@@ -240,9 +228,8 @@
msgid ""
"Profile with ID '%s' not defined in the content. Select a different profile, "
"please"
-msgstr ""
-"コンテンツで ID が '%s' のプロファイルが定義されていません。別のプロファイル"
-"を選択してください"
+msgstr "コンテンツで ID が '%s' "
+"のプロファイルが定義されていません。別のプロファイルを選択してください"
#: ../org_fedora_oscap/gui/spokes/oscap.py:856
msgid "Not applying security policy"
@@ -252,16 +239,14 @@
#. available
#: ../org_fedora_oscap/gui/spokes/oscap.py:887
msgid " or enter data stream content or archive URL below:"
-msgstr ""
-" または、以下にデータストリームコンテンツもしくはアーカイブの URL を入力しま"
-"す:"
+msgstr " または、以下にデータストリームコンテンツもしくはアーカイブの URL "
+"を入力します:"
#: ../org_fedora_oscap/gui/spokes/oscap.py:891 tmp/oscap.glade.h:12
msgid ""
"No content found. Please enter data stream content or archive URL below:"
-msgstr ""
-"コンテンツが見つかりませんでした。以下にデータストリームコンテンツもしくは"
-"アーカイブの URL を入力してください:"
+msgstr "コンテンツが見つかりませんでした。"
+"以下にデータストリームコンテンツもしくはアーカイブの URL を入力してください:"
#: ../org_fedora_oscap/gui/spokes/oscap.py:1029
msgid "Error fetching and loading content"
diff -U3 -N -r a/po/ko.po b/po/ko.po
--- a/po/ko.po 2021-07-30 15:17:14.000000000 +0200
+++ b/po/ko.po 2023-07-19 13:30:03.838518879 +0200
+++ b/po/ko.po 2022-07-20 13:28:31.143478128 +0200
@@ -1,13 +1,14 @@
# Ludek Janda <ljanda@redhat.com>, 2018. #zanata
# Ludek Janda <ljanda@redhat.com>, 2020. #zanata
@ -886,7 +635,7 @@ diff -U3 -N -r a/po/ko.po b/po/ko.po
msgid "The integrity check of the security content failed."
diff -U3 -N -r a/po/si.po b/po/si.po
--- a/po/si.po 2021-07-30 15:17:14.000000000 +0200
+++ b/po/si.po 2023-07-19 13:30:03.838518879 +0200
+++ b/po/si.po 2022-07-20 13:28:31.143478128 +0200
@@ -7,13 +7,16 @@
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
@ -918,7 +667,7 @@ diff -U3 -N -r a/po/si.po b/po/si.po
msgid "Fetching content data"
diff -U3 -N -r a/po/sv.po b/po/sv.po
--- a/po/sv.po 2021-07-30 15:17:14.000000000 +0200
+++ b/po/sv.po 2023-07-19 13:30:03.838518879 +0200
+++ b/po/sv.po 2022-07-20 13:28:31.144478135 +0200
@@ -1,12 +1,12 @@
-# Göran Uddeborg <goeran@uddeborg.se>, 2019. #zanata, 2020.
+# Göran Uddeborg <goeran@uddeborg.se>, 2019. #zanata, 2020, 2021.
@ -999,12 +748,12 @@ diff -U3 -N -r a/po/sv.po b/po/sv.po
msgid "Fetching content data"
diff -U3 -N -r a/po/zh_CN.po b/po/zh_CN.po
--- a/po/zh_CN.po 2021-07-30 15:17:14.000000000 +0200
+++ b/po/zh_CN.po 2023-07-19 13:30:03.838518879 +0200
+++ b/po/zh_CN.po 2022-07-20 13:28:31.144478135 +0200
@@ -1,41 +1,43 @@
-# Ludek Janda <ljanda@redhat.com>, 2018. #zanata
-# Ludek Janda <ljanda@redhat.com>, 2020. #zanata
+# Ludek Janda <ljanda@redhat.com>, 2018. #zanata, 2021, 2022.
+# Ludek Janda <ljanda@redhat.com>, 2020. #zanata, 2021, 2022.
+# Ludek Janda <ljanda@redhat.com>, 2018. #zanata, 2021.
+# Ludek Janda <ljanda@redhat.com>, 2020. #zanata, 2021.
+# Sundeep Anand <suanand@redhat.com>, 2021.
+# Transtats <suanand@redhat.com>, 2022.
msgid ""
@ -1015,8 +764,8 @@ diff -U3 -N -r a/po/zh_CN.po b/po/zh_CN.po
-"PO-Revision-Date: 2020-06-26 04:26-0400\n"
-"Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
-"Language-Team: Chinese (Simplified)\n"
+"PO-Revision-Date: 2022-11-02 07:19+0000\n"
+"Last-Translator: Ludek Janda <ljanda@redhat.com>\n"
+"PO-Revision-Date: 2022-05-07 06:18+0000\n"
+"Last-Translator: Transtats <suanand@redhat.com>\n"
+"Language-Team: Chinese (Simplified) <https://translate.fedoraproject.org/"
+"projects/oscap-anaconda-addon/rhel8-branch/zh_CN/>\n"
"Language: zh_CN\n"
@ -1026,7 +775,7 @@ diff -U3 -N -r a/po/zh_CN.po b/po/zh_CN.po
-"Plural-Forms: nplurals=1; plural=0\n"
-"X-Generator: Zanata 4.6.2\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Weblate 4.14.1\n"
+"X-Generator: Weblate 4.12.1\n"
#: ../org_fedora_oscap/common.py:326
#, python-brace-format
@ -1125,15 +874,6 @@ diff -U3 -N -r a/po/zh_CN.po b/po/zh_CN.po
#: tmp/oscap.glade.h:3
msgid "Apply security policy:"
@@ -293,7 +289,7 @@
#: tmp/oscap.glade.h:6
msgid "Choose profile below:"
-msgstr "选择档案:"
+msgstr "选择下面的配置文件:"
#: tmp/oscap.glade.h:7
msgid "Profile"
@@ -305,7 +301,7 @@
#: tmp/oscap.glade.h:9

View File

@ -1,32 +0,0 @@
From 6ac75d5052fff5a7d4b7e249ef198ccecd1f86a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mat=C4=9Bj=20T=C3=BD=C4=8D?= <matyc@redhat.com>
Date: Mon, 17 Jul 2023 17:08:54 +0200
Subject: [PATCH] Make tar extraction safer
See also https://bugzilla.redhat.com/show_bug.cgi?id=2218875
---
org_fedora_oscap/common.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/org_fedora_oscap/common.py b/org_fedora_oscap/common.py
index 05829ce..b27276e 100644
--- a/org_fedora_oscap/common.py
+++ b/org_fedora_oscap/common.py
@@ -360,7 +360,7 @@ def extract_data(archive, out_dir, ensure_has_files=None):
raise ExtractionError(msg)
utils.ensure_dir_exists(out_dir)
- zfile.extractall(path=out_dir)
+ zfile.extractall(path=out_dir, filter="data")
result = [utils.join_paths(out_dir, info.filename) for info in zfile.filelist]
zfile.close()
elif archive.endswith(".tar"):
@@ -418,7 +418,7 @@ def _extract_tarball(archive, out_dir, ensure_has_files, alg):
raise ExtractionError(msg)
utils.ensure_dir_exists(out_dir)
- tfile.extractall(path=out_dir)
+ tfile.extractall(path=out_dir, filter="data")
result = [utils.join_paths(out_dir, member.path) for member in tfile.getmembers()]
tfile.close()

View File

@ -1,66 +0,0 @@
From 58d4847dc4b55b9d4982be9505127679beca87c6 Mon Sep 17 00:00:00 2001
From: Matej Tyc <matyc@redhat.com>
Date: Wed, 18 Jan 2023 16:36:36 +0100
Subject: [PATCH 1/2] Handle the URL with missing ://
---
org_fedora_oscap/content_discovery.py | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/org_fedora_oscap/content_discovery.py b/org_fedora_oscap/content_discovery.py
index 42c61e0..23fdafd 100644
--- a/org_fedora_oscap/content_discovery.py
+++ b/org_fedora_oscap/content_discovery.py
@@ -67,9 +67,14 @@ def content_uri(self):
@content_uri.setter
def content_uri(self, uri):
- scheme, path = uri.split("://", 1)
- self.content_uri_path = path
- self.content_uri_scheme = scheme
+ scheme_and_maybe_path = uri.split("://")
+ if len(scheme_and_maybe_path) == 1:
+ msg = (
+ f"Invalid supplied content URL '{uri}', "
+ "use the 'scheme://path' form.")
+ raise KickstartValueError(msg)
+ self.content_uri_path = scheme_and_maybe_path[1]
+ self.content_uri_scheme = scheme_and_maybe_path[0]
def fetch_content(self, what_if_fail, ca_certs_path=""):
"""
@@ -80,7 +85,10 @@ def fetch_content(self, what_if_fail, ca_certs_path=""):
should handle them in the calling layer.
ca_certs_path: Path to the HTTPS certificate file
"""
- self.content_uri = self._addon_data.content_url
+ try:
+ self.content_uri = self._addon_data.content_url
+ except Exception as exc:
+ what_if_fail(exc)
shutil.rmtree(self.CONTENT_DOWNLOAD_LOCATION, ignore_errors=True)
self.CONTENT_DOWNLOAD_LOCATION.mkdir(parents=True, exist_ok=True)
fetching_thread_name = self._fetch_files(
From cbfdae4f43ade3ef982a967f3e2844e66db3f9a0 Mon Sep 17 00:00:00 2001
From: Matej Tyc <matyc@redhat.com>
Date: Wed, 18 Jan 2023 16:36:53 +0100
Subject: [PATCH 2/2] Stop fetching when there is an invalid profile
---
org_fedora_oscap/gui/spokes/oscap.py | 2 ++
1 file changed, 2 insertions(+)
diff --git a/org_fedora_oscap/gui/spokes/oscap.py b/org_fedora_oscap/gui/spokes/oscap.py
index d8e6ce2..54eae1e 100644
--- a/org_fedora_oscap/gui/spokes/oscap.py
+++ b/org_fedora_oscap/gui/spokes/oscap.py
@@ -469,6 +469,8 @@ def update_progress_label(msg):
if self._addon_data.profile_id and not selected:
# profile ID given, but it was impossible to select it -> invalid
# profile ID given
+ with self._fetch_flag_lock:
+ self._fetching = False
self._invalid_profile_id()
return

View File

@ -3,7 +3,7 @@
Name: oscap-anaconda-addon
Version: 1.2.1
Release: 14%{?dist}
Release: 10%{?dist}
Summary: Anaconda addon integrating OpenSCAP to the installation process
License: GPLv2+
@ -25,8 +25,6 @@ Patch4: oscap-anaconda-addon-1.2.2-absent_appstream-PR_184.patch
Patch5: oscap-anaconda-addon-1.3.0-better_archive_handling-PR_220.patch
Patch6: oscap-anaconda-addon-1.3.0-clicking_nocrash-PR_221.patch
Patch7: oscap-anaconda-addon-1.3.0-fix_content_paths-PR_225.patch
Patch8: oscap-anaconda-addon-null-http_content_url-PR_232.patch
Patch9: oscap-anaconda-addon-1.2.2-tar-extraction-PR_249.patch
BuildArch: noarch
BuildRequires: make
@ -59,8 +57,6 @@ content.
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
# NOTE CONCERNING TRANSLATION PATCHES
# When preparing translation patches, don't consider that some languages are unsupported -
# we aim to include all applicable translation texts to the appropriate patch.
@ -82,21 +78,6 @@ make install DESTDIR=%{buildroot}
%doc COPYING ChangeLog README.md
%changelog
* Wed Aug 02 2023 Jan Černý <jcerny@redhat.com> - 1.2.1-14
- Rebuild after tests update
* Wed Jul 19 2023 Jan Černý <jcerny@redhat.com> - 1.2.1-13
- Fix tar file extraction (rhbz#2219408)
- Update translations (rhbz#2189572)
* Wed Feb 08 2023 Matej Tyc <matyc@redhat.com> - 1.2.1-12
- Update translations
Resolves: rhbz#2139743
* Mon Jan 23 2023 Matej Tyc <matyc@redhat.com> - 1.2.1-11
- Fix a reaction to invalid content URI
Resolves: rhbz#2148509
* Wed Nov 23 2022 Matej Tyc <matyc@redhat.com> - 1.2.1-10
- Fix regression introduced when fixing content archive input
Resolves: rhbz#2129008