Skip to content

Check for RPMTAG_OPENPGP when detecting unsigned packages #556

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sshedi wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

Check for RPMTAG_OPENPGP when detecting unsigned packages #556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa7fa63
Check for RPMTAG_OPENPGP when detecting unsigned packages
sshedi Jan 21, 2026
a807cfa
pytests/tests/test_signature.py: make tests work with rpm-sequoia gpg…
sshedi Jan 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,12 @@ install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/" DESTINATION "${CMAKE_IN
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/pytests/tests/" DESTINATION "${CMAKE_INSTALL_DATADIR}/tdnf/pytests/tests")
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/pytests/repo/" DESTINATION "${CMAKE_INSTALL_DATADIR}/tdnf/pytests/repo")

option(BUILD_WITH_RPM_6X "Build with RPM 6.x support" OFF)

if(BUILD_WITH_RPM_6X)
add_compile_definitions(BUILD_WITH_RPM_6X)
endif()

set(LIB_TDNF "tdnf")
set(LIB_TDNF_SOLV "tdnfsolv")
set(LIB_TDNF_COMMON "common")
Expand Down
3 changes: 3 additions & 0 deletions client/gpgcheck.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,9 @@ TDNFGPGCheckPackage(
if (((pszTmp = headerGetAsString(rpmHeader, RPMTAG_SIGPGP)) == NULL) &&
((pszTmp = headerGetAsString(rpmHeader, RPMTAG_SIGGPG)) == NULL) &&
((pszTmp = headerGetAsString(rpmHeader, RPMTAG_DSAHEADER)) == NULL) &&
#ifdef BUILD_WITH_RPM_6X
((pszTmp = headerGetAsString(rpmHeader, RPMTAG_OPENPGP)) == NULL) &&
#endif
((pszTmp = headerGetAsString(rpmHeader, RPMTAG_RSAHEADER)) == NULL))
{
dwError = ERROR_TDNF_RPM_UNSIGNED;
Expand Down
13 changes: 13 additions & 0 deletions pytests/repo/setup-repo.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,19 @@ cp -r ${BUILD_PATH}/RPMS ${PUBLISH_SHA512_PATH}
mkdir -p ${PUBLISH_PATH}/keys
gpg --armor --export tdnftest@tdnf.test > ${PUBLISH_PATH}/keys/pubkey.asc

gpg --batch --generate-key <<EOF
Key-Type: RSA
Key-Length: 4096
Name-Real: tdnf test wrong
Name-Email: tdnftest@tdnf.wrong
Expire-Date: 0
%no-protection
%commit
EOF

WRONG_FPR=$(gpg --list-keys --with-colons tdnftest@tdnf.wrong | awk -F: '/^fpr:/ {print $10; exit}')
gpg --armor --export "${WRONG_FPR}" > ${PUBLISH_PATH}/keys/pubkey.wrong.asc

createrepo ${PUBLISH_PATH}
createrepo ${PUBLISH_SRC_PATH}
createrepo -s sha512 ${PUBLISH_SHA512_PATH}
Expand Down
4 changes: 3 additions & 1 deletion pytests/tests/test_signature.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,8 +212,10 @@ def test_install_nokey(utils):
# 'wrong' key in repo config, expect fail
def test_install_nokey1(utils):
set_gpgcheck(utils, True)
set_repo_key(utils, DEFAULT_KEY)
keypath = os.path.join(utils.config['repo_path'], 'photon-test', 'keys', 'pubkey.wrong.asc')
set_repo_key(utils, f"file://{keypath}")
pkgname = utils.config["sglversion_pkgname"]
utils.run(['rpm', '--import', keypath])
ret = utils.run(['tdnf', 'install', '-y', pkgname])
assert ret['retval'] == 1514
assert not utils.check_package(pkgname)