Changeset 2234 in ProjectBuilder

Timestamp:

Jun 27, 2017, 3:32:10 PM (8 years ago)

Author:

Bruno Cornec

Message:

Adds https_proxy support

Location:

devel

Files:

• pb-doc/SECURITY (modified) (1 diff)
• pb-modules/etc/pb.conf.pod (modified) (1 diff)
• pb-modules/lib/ProjectBuilder/Distribution.pm (modified) (2 diffs)
• pb-modules/lib/ProjectBuilder/VE.pm (modified) (2 diffs)
• pb/bin/pb (modified) (3 diffs)
• rpmbootstrap/bin/rpmbootstrap (modified) (1 diff)

devel/pb-doc/SECURITY

@@ -24 +24 @@
 
 The default /etc/sudoers file created for VM/VE contains:
-Defaults:pb env_keep += "http_proxy ftp_proxy"
+Defaults:pb env_keep += "http_proxy https_proxy ftp_proxy"
 Defaults:pb !requiretty
 pb ALL=(ALL) NOPASSWD:ALL

devel/pb-modules/etc/pb.conf.pod

@@ -167 +167 @@
  Example: http_proxy default = http://example.com:3128/
 
+=item B<https_proxy>
+
+ Nature: Optional
+ Key: OS (could be from the most generic up to the most specific from ostype, osfamily, os, os-ver, os-ver-arch). The family name is generaly used here.
+ Value: string indicating the proxy to use
+ Conffile: pb
+ Example: https_proxy default = http://example.com:3128/
+
 =item B<logcmd>
 

devel/pb-modules/lib/ProjectBuilder/Distribution.pm

@@ -322 +322 @@
 my $ftp_proxy = pb_distro_get_param($pbos,pb_conf_get_if("ftp_proxy"));
 my $http_proxy = pb_distro_get_param($pbos,pb_conf_get_if("http_proxy"));
+my $https_proxy = pb_distro_get_param($pbos,pb_conf_get_if("https_proxy"));
 
 # We do not overwrite shell settings
 $ENV{ftp_proxy} ||= $ftp_proxy if ((defined $ftp_proxy) && ($ftp_proxy ne ""));
 $ENV{http_proxy} ||= $http_proxy if ((defined $http_proxy) && ($http_proxy ne ""));
+$ENV{https_proxy} ||= $https_proxy if ((defined $https_proxy) && ($https_proxy ne ""));
 }
 
@@ -350 +352 @@
 pb_log(1, "ftp_proxy=$ENV{ftp_proxy}\n") if (defined $ENV{ftp_proxy});
 pb_log(1, "http_proxy=$ENV{http_proxy}\n")  if (defined $ENV{http_proxy});
+pb_log(1, "https_proxy=$ENV{https_proxy}\n")  if (defined $ENV{https_proxy});
 
 # Get dependencies in the build file if not forced

devel/pb-modules/lib/ProjectBuilder/VE.pm

@@ -96 +96 @@
 if ($EFFECTIVE_USER_ID != 0) {
     $sudocmd ="sudo ";
-    foreach my $proxy (qw/http_proxy ftp_proxy/) {
+    foreach my $proxy (qw/http_proxy https_proxy ftp_proxy/) {
         if (defined $ENV{$proxy}) {
             open(CMD,"sudo sh -c 'echo \$$proxy' |") or die "can't run sudo sh?: $!";
@@ -308 +308 @@
             print DOCKER "ENV ftp_proxy $ENV{ftp_proxy}\n" if (defined $ENV{ftp_proxy});
             print DOCKER "ENV http_proxy $ENV{http_proxy}\n" if (defined $ENV{http_proxy});
+            print DOCKER "ENV https_proxy $ENV{https_proxy}\n" if (defined $ENV{https_proxy});
             # We are root in that container so no need to sudo, which is present potentially
             my $cmd2 = $pbos->{'install'};

devel/pb/bin/pb

@@ -619 +619 @@
  verpmtype default = rpmbootstrap
 
-You may also choose to specify a mirror for the OS packages, and optionally http/ftp proxies.  You can specify the proxies either through environment variables ($http_proxy/$ftp_proxy) or in the configuration file. The configuration file will be used if no corresponding environment variable has been set. For example, for debian and with a local squid proxy:
+You may also choose to specify a mirror for the OS packages, and optionally http/ftp proxies.  You can specify the proxies either through environment variables ($http_proxy/$https_proxy/$ftp_proxy) or in the configuration file. The configuration file will be used if no corresponding environment variable has been set. For example, for debian and with a local squid proxy:
 
  rbsmirrorsrv debian = http://mirrors1.kernel.org/debian/
  http_proxy default = http://localhost:3128/
+ https_proxy default = http://localhost:3128/
  ftp_proxy default = http://localhost:3128/
 
@@ -3389 +3390 @@
         print SCRIPT "export http_proxy=\"$ENV{'http_proxy'}\"\n";
     }
-
+    if (defined $ENV{'https_proxy'}) {
+        print SCRIPT "export https_proxy=\"$ENV{'https_proxy'}\"\n";
+    }
     if (defined $ENV{'ftp_proxy'}) {
         print SCRIPT "export ftp_proxy=\"$ENV{'ftp_proxy'}\"\n";
@@ -3858 +3861 @@
         print SCRIPT << "EOF";
 # Keep proxy configuration while using sudo
-print PBOUT "Defaults:$pbac->{$ENV{'PBPROJ'}}    env_keep += \\\"http_proxy ftp_proxy\\\"\\n";
-print PBOUT "Defaults:root    env_keep += \\\"http_proxy ftp_proxy\\\"\\n";
+print PBOUT "Defaults:$pbac->{$ENV{'PBPROJ'}}    env_keep += \\\"http_proxy https_proxy ftp_proxy\\\"\\n";
+print PBOUT "Defaults:root    env_keep += \\\"http_proxy https_proxy ftp_proxy\\\"\\n";
 EOF
     }

devel/rpmbootstrap/bin/rpmbootstrap

@@ -585 +585 @@
 #
 $pbos->{'install'} =~ s/sudo//g;
-if (((defined $ENV{http_proxy}) && ($ENV{http_proxy} ne '')) || ((defined $ENV{ftp_proxy}) && ($ENV{ftp_proxy} ne ''))) {
+if (((defined $ENV{http_proxy}) && ($ENV{http_proxy} ne '')) || ((defined $ENV{https_proxy}) && ($ENV{https_proxy} ne '')) || ((defined $ENV{ftp_proxy}) && ($ENV{ftp_proxy} ne ''))) {
     if ($pbos->{'name'} eq "opensuse") {
         # For opensuse 11.4 or 12.1 -- one of them didn't work with http_proxy or HTTP_PROXY set.
         open(PROXY, "> $vepath/etc/sysconfig/proxy") || die "can't open $vepath/etc/sysconfig/proxy: $!";
         print PROXY "HTTP_PROXY=$ENV{http_proxy}\n" if ((defined $ENV{http_proxy}) && ($ENV{http_proxy} ne ''));
+        print PROXY "HTTPS_PROXY=$ENV{https_proxy}\n" if ((defined $ENV{https_proxy}) && ($ENV{https_proxy} ne ''));
         print PROXY "FTP_PROXY=$ENV{ftp_proxy}\n" if ((defined $ENV{ftp_proxy}) && ($ENV{ftp_proxy} ne ''));
         close(PROXY);