Skip to content

do not use key/cert to access local file system based repo #29

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

Merged
citrus-it merged 1 commit into from
Apr 27, 2026
Merged

do not use key/cert to access local file system based repo #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions .github/workflows/unit-tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ jobs:
# - windows-latest

perl:
- '5.36'
- '5.38'
- '5.40'
- '5.42'
# exclude:
#- os: ubuntu-16.04
# perl: '5.26'
Expand Down Expand Up @@ -54,7 +54,7 @@ jobs:

- name: CPAN Cache
id: cpan-cache
uses: actions/cache@v1
uses: actions/cache@v4
with:
path: thirdparty
key: ${{ matrix.os }}-cpan-${{ matrix.perl }}-${{ hashFiles('**/cpanfile') }}
Expand Down
18 changes: 10 additions & 8 deletions lib/PkgMgr.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,13 +245,12 @@ sub publishPackages {

my ($srcRepo, $dstRepo) = $self->getSrcDstRepos($config, $repo, $opts);

my @cert = $opts->{pull} || $opts->{export} ? ()
: ('--dkey', $config->{GENERAL}->{key_file},
'--dcert', $config->{GENERAL}->{cert_file});
my @cert;
push @cert, ('--dkey', $config->{GENERAL}->{key_file}, '--dcert', $config->{GENERAL}->{cert_file})
if !$opts->{pull} && !$opts->{export} && $dstRepo =~ m!^https?://!;

push @cert, $config->{REPOS}->{$repo}->{restricted} ne 'yes' ? ()
: ('--key', $config->{GENERAL}->{key_file},
'--cert', $config->{GENERAL}->{cert_file});
push @cert, ('--key', $config->{GENERAL}->{key_file}, '--cert', $config->{GENERAL}->{cert_file})
if $config->{REPOS}->{$repo}->{restricted} eq 'yes';

# set timeout env variables
$ENV{PKG_CLIENT_CONNECT_TIMEOUT} = $config->{GENERAL}->{connect_timeout};
Expand Down Expand Up @@ -292,8 +291,11 @@ sub rebuildRepo {

my $repoPath = $self->getRepoPath($config, $repo, $opts);

my @cmd = ($PKGREPO, qw(rebuild -s), $repoPath, ($opts->{staging} || $opts->{dst} ? ('--key',
$config->{GENERAL}->{key_file}, '--cert', $config->{GENERAL}->{cert_file}) : ()));
my @cert;
push @cert, ('--key', $config->{GENERAL}->{key_file}, '--cert', $config->{GENERAL}->{cert_file})
if $repoPath =~ m!^https?://!;

my @cmd = ($PKGREPO, qw(rebuild -s), $repoPath, @cert);

system (@cmd) && die "ERROR: rebuilding repo '$repoPath'.\n";
}
Expand Down
43 changes: 43 additions & 0 deletions thirdparty/cpanfile-5.42.snapshot
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
# carton snapshot format: version 1.0
DISTRIBUTIONS
Convert-ASN1-0.34
pathname: T/TI/TIMLEGGE/Convert-ASN1-0.34.tar.gz
provides:
Convert::ASN1 0.34
requirements:
ExtUtils::MakeMaker 0
Crypt-OpenSSL-Guess-0.15
pathname: A/AK/AKIYM/Crypt-OpenSSL-Guess-0.15.tar.gz
provides:
Crypt::OpenSSL::Guess 0.15
requirements:
Config 0
Exporter 5.57
ExtUtils::MakeMaker 6.64
File::Spec 0
Symbol 0
perl 5.008001
Crypt-OpenSSL-X509-2.0.1
pathname: J/JO/JONASBN/Crypt-OpenSSL-X509-2.0.1.tar.gz
provides:
Crypt::OpenSSL::X509 2.000001
requirements:
Config 0
Convert::ASN1 0.33
Crypt::OpenSSL::Guess 0
ExtUtils::MakeMaker 0
version 0.77
Data-Processor-1.0.9
pathname: M/MB/MBP/Data-Processor-1.0.9.tar.gz
provides:
Data::Processor 1.000009
Data::Processor::Error::Collection undef
Data::Processor::Error::Instance undef
Data::Processor::Generator undef
Data::Processor::PodWriter undef
Data::Processor::Transformer undef
Data::Processor::Validator undef
Data::Processor::ValidatorFactory undef
requirements:
ExtUtils::MakeMaker 0
perl 5.008005
Loading