From 334bead74bc9c5e819f14946726eaad40986d636 Mon Sep 17 00:00:00 2001
From: Dylan William Hardison <dylan@hardison.net>
Date: Sat, 16 Dec 2017 13:17:05 -0600
Subject: Bug 1403777 - Migrate urlbase from params to localconfig

---
 Bugzilla/Config/Advanced.pm   |  6 ------
 Bugzilla/Config/Attachment.pm |  8 +-------
 Bugzilla/Config/Common.pm     | 28 +-------------------------
 Bugzilla/Config/Core.pm       | 46 -------------------------------------------
 4 files changed, 2 insertions(+), 86 deletions(-)
 delete mode 100644 Bugzilla/Config/Core.pm

(limited to 'Bugzilla/Config')

diff --git a/Bugzilla/Config/Advanced.pm b/Bugzilla/Config/Advanced.pm
index d7fdd34aa..dc5be490f 100644
--- a/Bugzilla/Config/Advanced.pm
+++ b/Bugzilla/Config/Advanced.pm
@@ -16,12 +16,6 @@ use Bugzilla::Config::Common;
 our $sortkey = 1700;
 
 use constant get_param_list => (
-    {
-        name    => 'cookiedomain',
-        type    => 't',
-        default => ''
-    },
-
     {
         name    => 'inbound_proxies',
         type    => 't',
diff --git a/Bugzilla/Config/Attachment.pm b/Bugzilla/Config/Attachment.pm
index bc2f45029..c3dbd03ed 100644
--- a/Bugzilla/Config/Attachment.pm
+++ b/Bugzilla/Config/Attachment.pm
@@ -23,12 +23,6 @@ sub get_param_list {
             type    => 'b',
             default => 0
         },
-        {
-            name    => 'attachment_base',
-            type    => 't',
-            default => '',
-            checker => \&check_urlbase
-        },
         {
             name    => 'allow_attachment_deletion',
             type    => 'b',
@@ -68,7 +62,7 @@ sub get_param_list {
 
 sub check_params {
     my ( $class, $params ) = @_;
-    return unless $params->{attachment_storage} eq 's3';
+    return '' unless $params->{attachment_storage} eq 's3';
 
     if (   $params->{s3_bucket} eq ''
         || $params->{aws_access_key_id} eq ''
diff --git a/Bugzilla/Config/Common.pm b/Bugzilla/Config/Common.pm
index 8b1a9da91..fabf7c880 100644
--- a/Bugzilla/Config/Common.pm
+++ b/Bugzilla/Config/Common.pm
@@ -23,7 +23,7 @@ use Bugzilla::Status;
 use base qw(Exporter);
 @Bugzilla::Config::Common::EXPORT = qw(
     check_multi check_numeric check_regexp check_url check_group
-    check_sslbase check_priority check_severity check_platform
+    check_priority check_severity check_platform
     check_opsys check_shadowdb check_urlbase check_webdotbase
     check_user_verify_class
     check_mail_delivery_method check_notification check_utf8
@@ -81,32 +81,6 @@ sub check_email {
     return "";
 }
 
-sub check_sslbase {
-    my $url = shift;
-    if ( $url ne '' ) {
-        if ( $url !~ m#^https://([^/]+).*/$# ) {
-            return "must be a legal URL, that starts with https and ends with a slash.";
-        }
-        my $host = $1;
-
-        # Fall back to port 443 if for some reason getservbyname() fails.
-        my $port = getservbyname( 'https', 'tcp' ) || 443;
-        if ( $host =~ /^(.+):(\d+)$/ ) {
-            $host = $1;
-            $port = $2;
-        }
-        local *SOCK;
-        my $proto = getprotobyname('tcp');
-        socket( SOCK, PF_INET, SOCK_STREAM, $proto );
-        my $iaddr = inet_aton($host) || return "The host $host cannot be resolved";
-        my $sin = sockaddr_in( $port, $iaddr );
-        if ( !connect( SOCK, $sin ) ) {
-            return "Failed to connect to $host:$port; unable to enable SSL";
-        }
-        close(SOCK);
-    }
-    return "";
-}
 
 sub check_utf8 {
     my $utf8 = shift;
diff --git a/Bugzilla/Config/Core.pm b/Bugzilla/Config/Core.pm
deleted file mode 100644
index b3848a16e..000000000
--- a/Bugzilla/Config/Core.pm
+++ /dev/null
@@ -1,46 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This Source Code Form is "Incompatible With Secondary Licenses", as
-# defined by the Mozilla Public License, v. 2.0.
-
-package Bugzilla::Config::Core;
-
-use 5.10.1;
-use strict;
-use warnings;
-
-use Bugzilla::Config::Common;
-
-our $sortkey = 100;
-
-use constant get_param_list => (
-    {
-        name    => 'urlbase',
-        type    => 't',
-        default => '',
-        checker => \&check_urlbase
-    },
-
-    {
-        name    => 'ssl_redirect',
-        type    => 'b',
-        default => 0
-    },
-
-    {
-        name    => 'sslbase',
-        type    => 't',
-        default => '',
-        checker => \&check_sslbase
-    },
-
-    {
-        name    => 'cookiepath',
-        type    => 't',
-        default => '/'
-    },
-);
-
-1;
-- 
cgit v1.2.3-24-g4f1b