Merge remote-tracking branch 'origin/SLE-12-GA' into drop_sslv_12sp1

package/yast2-ftp-server.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jun  7 09:22:47 UTC 2018 - jreidinger@suse.com
+
+- Drop SSLv2 and SSLv3 as it is dropped for security reason for
+  vsftpd (bsc#921303)
+
 -------------------------------------------------------------------
 Thu Dec  4 09:50:12 UTC 2014 - jreidinger@suse.com
 

src/autoyast-rnc/ftp-server.rnc

@@ -28,13 +28,11 @@ ftp-server =
      element SSL { text }? &
      element StartXinetd { text }? &
      element StartDaemon  { text }? &
-     element SSLv2  { text }? &
-     element SSLv3  { text }? &
      element PassiveMode { text }? &
      element CertFile { text }? &
      element VirtualUser { text }? &
      element FTPUser { text }? &
      element GuestUser { text }? &
      element EnableUpload { text }?
 
-}
+}

src/clients/ftp-server.rb

@@ -193,24 +193,6 @@ def main
             "example" => ["SSL enable", "SSL disable"]
           },
           # only vsftpd
-          "SSLv2"           => {
-            "handler" => fun_ref(method(:FTPdCMDSSLv2), "boolean (map)"),
-            # TRANSLATORS: CommandLine help
-            "help"    => _(
-              "If enabled, this option will permit SSL v2 protocol connections (vsftpd only)."
-            ),
-            "example" => ["SSLv2 enable", "SSLv2 disable"]
-          },
-          # only vsftpd
-          "SSLv3"           => {
-            "handler" => fun_ref(method(:FTPdCMDSSLv3), "boolean (map)"),
-            # TRANSLATORS: CommandLine help
-            "help"    => _(
-              "If enabled, this option will permit SSL v3 protocol connections (vsftpd only)."
-            ),
-            "example" => ["SSLv3 enable", "SSLv3 disable"]
-          },
-          # only vsftpd
           "TLS"             => {
             "handler" => fun_ref(method(:FTPdCMDTLS), "boolean (map)"),
             # TRANSLATORS: CommandLine help
@@ -402,10 +384,6 @@ def main
           #only vsftpd
           "SSL"             => ["enable", "disable"],
           #only vsftpd
-          "SSLv2"           => ["enable", "disable"],
-          #only vsftpd
-          "SSLv3"           => ["enable", "disable"],
-          #only vsftpd
           "TLS"             => ["enable", "disable"],
           #only pure-ftp-server
           "antiwarez"       => ["enable", "disable"],
@@ -624,18 +602,6 @@ def FTPdCMDShow(options)
           CommandLine.Print(_("SSL is enabled"))
         end
 
-        if Ops.get(FtpServer.EDIT_SETTINGS, "SSLv2") != "YES"
-          CommandLine.Print(_("SSL version 2 is disabled"))
-        else
-          CommandLine.Print(_("SSL version 2 is enabled"))
-        end
-
-        if Ops.get(FtpServer.EDIT_SETTINGS, "SSLv3") != "YES"
-          CommandLine.Print(_("SSL version 3 is disabled"))
-        else
-          CommandLine.Print(_("SSL version 3 is enabled"))
-        end
-
         if Ops.get(FtpServer.EDIT_SETTINGS, "TLS") != "YES"
           CommandLine.Print(_("TLS is disabled"))
         else
@@ -1171,28 +1137,6 @@ def FTPdCMDTLS(options)
       CommonHandlerCheckBox(options, "TLS connections:", true, "TLS", "TLS")
     end
 
-    def FTPdCMDSSLv2(options)
-      options = deep_copy(options)
-      CommonHandlerCheckBox(
-        options,
-        "SSL version 2 connections:",
-        true,
-        "SSLv2",
-        "SSL version 2"
-      )
-    end
-
-    def FTPdCMDSSLv3(options)
-      options = deep_copy(options)
-      CommonHandlerCheckBox(
-        options,
-        "SSL version 3 connections:",
-        true,
-        "SSLv3",
-        "SSL version 3"
-      )
-    end
-
     def FTPdCMDAntiwarez(options)
       options = deep_copy(options)
       CommonHandlerCheckBox(

src/include/ftp-server/dialogs.rb

@@ -61,8 +61,6 @@ def initialize_ftp_server_dialogs(include_target)
         "PasMinPort"       => PasMinPort(),
         "PasMaxPort"       => PasMaxPort(),
         "SSLEnable"        => SSLEnable(),
-        "SSLv2"            => SSLv2(),
-        "SSLv3"            => SSLv3(),
         "TLS"              => TLS(),
         "CertFile"         => CertFile(),
         "BrowseCertFile"   => BrowseCertFile(),
@@ -1086,63 +1084,6 @@ def SSLEnable
       deep_copy(result)
     end
 
-
-    # Enable SSL v2
-    # Expert Settings widget
-    #
-    # @return [Hash{String => Object}] map for Expert screen
-    def SSLv2
-      result = {}
-
-      Ops.set(result, "label", _("&Enable SSL v2"))
-      Ops.set(result, "widget", :checkbox)
-      Ops.set(result, "opt", [:notify])
-      Ops.set(result, "init", fun_ref(method(:InitSSLv2), "void (string)"))
-      Ops.set(
-        result,
-        "handle",
-        fun_ref(method(:HandleUniversal), "symbol (string, map)")
-      )
-      Ops.set(
-        result,
-        "store",
-        fun_ref(method(:StoreSSLv2), "void (string, map)")
-      )
-      Ops.set(result, "help", DialogHelpText("SSLv2"))
-
-      deep_copy(result)
-    end
-
-
-    # Enable SSL v3
-    # Expert Settings widget
-    #
-    # @return [Hash{String => Object}] map for Expert screen
-
-
-    def SSLv3
-      result = {}
-
-      Ops.set(result, "label", _("Enable SSL &v3"))
-      Ops.set(result, "widget", :checkbox)
-      Ops.set(result, "opt", [:notify])
-      Ops.set(result, "init", fun_ref(method(:InitSSLv3), "void (string)"))
-      Ops.set(
-        result,
-        "handle",
-        fun_ref(method(:HandleUniversal), "symbol (string, map)")
-      )
-      Ops.set(
-        result,
-        "store",
-        fun_ref(method(:StoreSSLv3), "void (string, map)")
-      )
-      Ops.set(result, "help", DialogHelpText("SSLv3"))
-
-      deep_copy(result)
-    end
-
-
     # Enable TLS
     # Expert Settings widget
     #
@@ -1658,8 +1599,6 @@ def addit_settings
                 HBox(
                   HSpacing(2),
                   VBox(
-                    Left("SSLv2"), # end of `Left(`HBox(
-                    Left("SSLv3"),
                     Left("TLS"),
                     Left(HBox("CertFile", VBox(Label(""), "BrowseCertFile")))
                   )
@@ -1683,8 +1622,6 @@ def addit_settings
           "Firewall",
           "PasMinPort",
           "PasMaxPort",
-          "SSLv2",
-          "SSLv3",
           "TLS",
           "CertFile",
           "BrowseCertFile",

src/include/ftp-server/helps.rb

@@ -203,18 +203,6 @@ def initialize_ftp_server_helps(include_target)
             "If enabled, SSL connections are allowed.\n" +
             "</p>\n"
         ),
-        # expert settings  Enable SSL v2 help 1/1
-        "SSLv2"             => _(
-          "<p><b>Enable SSL v2</b><br>\n" +
-            "If enabled, SSL version 2 connections are allowed.\n" +
-            "</p>\n"
-        ),
-        # expert settings  Enable SSL v3 help 1/1
-        "SSLv3"             => _(
-          "<p><b>Enable SSL v3</b><br>\n" +
-            "If enabled, SSL version 3 connections are allowed.\n" +
-            "</p>\n"
-        ),
         # expert settings Enable TLS  help 1/1
         "TLS"               => _(
           "<p><b>Enable TLS</b><br>\n" +

src/include/ftp-server/wid_functions.rb

@@ -1496,14 +1496,10 @@ def HandleSSLEnable(key, event)
       event = deep_copy(event)
       value = Convert.to_boolean(UI.QueryWidget(Id("SSLEnable"), :Value))
       if value
-        UI.ChangeWidget(Id("SSLv2"), :Enabled, true)
-        UI.ChangeWidget(Id("SSLv3"), :Enabled, true)
         UI.ChangeWidget(Id("TLS"), :Enabled, true)
         UI.ChangeWidget(Id("CertFile"), :Enabled, true)
         UI.ChangeWidget(Id("BrowseCertFile"), :Enabled, true)
       else
-        UI.ChangeWidget(Id("SSLv2"), :Enabled, false)
-        UI.ChangeWidget(Id("SSLv3"), :Enabled, false)
         UI.ChangeWidget(Id("TLS"), :Enabled, false)
         UI.ChangeWidget(Id("CertFile"), :Enabled, false)
         UI.ChangeWidget(Id("BrowseCertFile"), :Enabled, false)
@@ -1530,70 +1526,6 @@ def StoreSSLEnable(key, event)
       nil
     end
 
-    # Init function of "Enable SSL v2"
-    # intfield
-    #
-    # also include handling enable/disable SSL
-    # handling checkboxframe
-    def InitSSLv2(key)
-      UI.ChangeWidget(
-        Id("SSLv2"),
-        :Value,
-        FtpServer.ValueUIEdit("SSLv2") == "YES"
-      )
-      UI.ChangeWidget(
-        Id("SSLEnable"),
-        :Value,
-        FtpServer.ValueUIEdit("SSLEnable") == "YES"
-      )
-
-      nil
-    end
-
-    # Store function of "Enable SSL v2"
-    # save values to temporary structure
-    #
-    # also include handling value enable/disable passive mode
-    def StoreSSLv2(key, event)
-      event = deep_copy(event)
-      FtpServer.WriteToEditMap(
-        "SSLv2",
-        Convert.to_boolean(UI.QueryWidget(Id("SSLv2"), :Value)) == true ? "YES" : "NO"
-      )
-      FtpServer.WriteToEditMap(
-        "SSLEnable",
-        Convert.to_boolean(UI.QueryWidget(Id("SSLEnable"), :Value)) == true ? "YES" : "NO"
-      )
-
-      nil
-    end
-
-    # Init function of "Enable SSL v3"
-    # intfield
-    #
-    def InitSSLv3(key)
-      UI.ChangeWidget(
-        Id("SSLv3"),
-        :Value,
-        FtpServer.ValueUIEdit("SSLv3") == "YES"
-      )
-
-      nil
-    end
-
-    # Store function of "Enable SSL v3"
-    # save value to temporary structure
-    #
-    def StoreSSLv3(key, event)
-      event = deep_copy(event)
-      FtpServer.WriteToEditMap(
-        "SSLv3",
-        Convert.to_boolean(UI.QueryWidget(Id("SSLv3"), :Value)) == true ? "YES" : "NO"
-      )
-
-      nil
-    end
-
     # Init function of "Enable TLS"
     # intfield
     #

src/include/ftp-server/write_load.rb

@@ -1219,46 +1219,6 @@ def ValueUI(key, write)
               return ""
             end
           end
-        when "SSLv2"
-          if @vsftpd_edit
-            if write
-              Ops.set(
-                @VS_SETTINGS,
-                "ssl_sslv2",
-                Ops.get(@EDIT_SETTINGS, "SSLv2")
-              )
-            else
-              return Builtins.haskey(@VS_SETTINGS, "ssl_sslv2") ?
-                Builtins.toupper(Ops.get(@VS_SETTINGS, "ssl_sslv2")) :
-                Ops.get(@DEFAULT_CONFIG, "SSLv2")
-            end
-          else
-            if !write
-              return Ops.get(@DEFAULT_CONFIG, "SSLv2")
-            else
-              return ""
-            end
-          end
-        when "SSLv3"
-          if @vsftpd_edit
-            if write
-              Ops.set(
-                @VS_SETTINGS,
-                "ssl_sslv3",
-                Ops.get(@EDIT_SETTINGS, "SSLv3")
-              )
-            else
-              return Builtins.haskey(@VS_SETTINGS, "ssl_sslv3") ?
-                Builtins.toupper(Ops.get(@VS_SETTINGS, "ssl_sslv3")) :
-                Ops.get(@DEFAULT_CONFIG, "SSLv3")
-            end
-          else
-            if !write
-              return Ops.get(@DEFAULT_CONFIG, "SSLv3")
-            else
-              return ""
-            end
-          end
         when "FTPUser"
           if @vsftpd_edit
             if write

src/modules/FtpServer.rb

@@ -184,8 +184,6 @@ def main
         "StartXinetd",
         "PassiveMode",
         "CertFile",
-        "SSLv2",
-        "SSLv3",
         "VirtualUser",
         "FTPUser",
         "GuestUser",
@@ -213,8 +211,6 @@ def main
         "AnonCreatDirs"    => "NO",
         "Banner"           => _("Welcome message"),
         "SSLEnable"        => "NO",
-        "SSLv2"            => "NO", #enable/disable SSL version 2 (vsftpd only)
-        "SSLv3"            => "NO", #enable/disable SSL version 3 (vsftpd only)
         "TLS"              => "YES",
         "AntiWarez"        => "YES",
         "SSL"              => "0", #0 - disable SSL, 1-accept SSL, 2 - refuse connection withou SSL (pure-ftpd only)