folkslinux
/
tdnf
mirror of https://github.com/vmware/tdnf.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed TDNFDownloadFile call in repogpgcheck plugin 

repogpgcheck plugin calls TDNFDownloadFile but it's signtaure was wrong.
As a result this was ending up in unacceptable results.

Signed-off-by: Shreenidhi Shedi <sshedi@vmware.com>
This commit is contained in:
Shreenidhi Shedi 2020-10-01 16:16:35 +05:30
parent ab22ea14ef
commit f3cca664a3
4 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/repogpgcheck/includes.h
View File

@ -28,6 +28,7 @@
#include "../../common/defines.h"
#include "../../common/structs.h"
#include "../../common/prototypes.h"
#include "../../client/includes.h"
#include "defines.h"
#include "structs.h"
#include "prototypes.h"

9
plugins/repogpgcheck/prototypes.h
View File

@ -79,13 +79,4 @@ TDNFRepoGPGCheckReadConfig(
PTDNF_EVENT_CONTEXT pContext
);
uint32_t
TDNFDownloadFile(
PTDNF pTdnf,
const char *pszRepo,
const char *pszFileUrl,
const char *pszFile,
const char *pszProgressData
);
#endif /* __PLUGINS_REPOGPGCHECK_PROTOTYPES_H__ */

13
plugins/repogpgcheck/repogpgcheck.c
View File

@ -197,12 +197,13 @@ TDNFVerifySignature(
TDNF_REPO_METADATA_SIG_EXT);
BAIL_ON_TDNF_ERROR(dwError);
dwError = TDNFDownloadFile(
pHandle->pTdnf,
pcszRepoId,
pszRepoMDSigUrl,
pszRepoMDSigFile,
pcszRepoId);
dwError = TDNFDownloadFile(pHandle->pTdnf,
pcszRepoId,
pszRepoMDSigUrl,
pszRepoMDSigFile,
pcszRepoId,
0,
NULL);
BAIL_ON_TDNF_ERROR(dwError);
dwError = TDNFVerifyRepoMDSignature(pHandle, pcszRepoMDFile, pszRepoMDSigFile);

9
pytests/tests/test_repogpgcheck.py
View File

@ -67,11 +67,4 @@ def test_tdnfrepogpgcheck_plugin_validatesignature(utils):
ret = utils.run([ 'tdnf', 'repolist', '--refresh'])
#we should load the plugin
assert(ret['stdout'][0].startswith('Loaded plugin: tdnfrepogpgcheck')) #nosec
dist = os.environ.get('DIST')
if dist == 'photon':
assert(ret['retval'] == 0)
elif dist == 'fedora':
# TODO:
# 'tdnf repolist --refresh' fails with "Unable to parse metalink, ERROR: code=201"
# needs to be investigated
assert(ret['retval'] == 86)
assert(ret['retval'] == 0)