Add 's' service names to portrules

CHANGELOG

@@ -1,5 +1,9 @@
 #Nmap Changelog ($Id$); -*-text-*-
 
+o [NSE][GH#1066] Added service names for SSL-protected services like
+  amt-soap-https to portrules for several scripts, ensuring they run on these
+  as well as the standard unencrypted services.
+
 o Audited and converted most instances of strcat, strcpy, and sprintf to use
   bounded functions instead.
 

nselib/ftp.lua

@@ -4,6 +4,7 @@
 -- @copyright Same as Nmap--See https://nmap.org/book/man-legal.html
 
 local comm = require "comm"
+local shortport = require "shortport"
 local stdnse = require "stdnse"
 local string = require "string"
 local table = require "table"
@@ -11,6 +12,10 @@ local ipOps = require "ipOps"
 local nmap = require "nmap"
 _ENV = stdnse.module("ftp", stdnse.seeall)
 
+--- Portrule for FTP services
+-- @class function
+portrule = shortport.port_or_service({21, 990}, {"ftp", "ftps"})
+
 local ERROR_MESSAGES = {
   ["EOF"]     = "connection closed",
   ["TIMEOUT"] = "connection timeout",

scripts/amqp-info.nse

@@ -37,7 +37,7 @@ license = "Same as Nmap--See https://nmap.org/book/man-legal.html"
 categories = {"default", "discovery", "safe", "version"}
 
 
-portrule = shortport.version_port_or_service(5672, "amqp", "tcp", "open")
+portrule = shortport.version_port_or_service(5672, {"amqp", "amqps"}, "tcp", "open")
 
 action = function(host, port)
   local cli = amqp.AMQP:new( host, port )

scripts/coap-resources.nse

@@ -73,8 +73,7 @@ author = "Mak Kolybabi <mak@kolybabi.com>"
 license = "Same as Nmap--See https://nmap.org/book/man-legal.html"
 categories = {"safe", "discovery"}
 
--- TODO: Add 5684 "coaps" if DTLS support is added
-portrule = shortport.port_or_service(5683, "coap", "udp")
+portrule = shortport.port_or_service({5683, 5684}, {"coap", "coaps"}, "udp")
 
 format_payload = function(payload)
   -- Leave strings alone.

scripts/ftp-anon.nse

@@ -1,7 +1,6 @@
 local ftp = require "ftp"
 local match = require "match"
 local nmap = require "nmap"
-local shortport = require "shortport"
 local stdnse = require "stdnse"
 local string = require "string"
 local table = require "table"
@@ -38,7 +37,7 @@ license = "Same as Nmap--See https://nmap.org/book/man-legal.html"
 categories = {"default", "auth", "safe"}
 
 
-portrule = shortport.port_or_service({21,990}, {"ftp","ftps"})
+portrule = ftp.portrule
 
 -- ---------------------
 -- Directory listing function.

scripts/ftp-bounce.nse

@@ -1,5 +1,4 @@
 local nmap = require "nmap"
-local shortport = require "shortport"
 local stdnse = require "stdnse"
 local string = require "string"
 local ftp = require "ftp"
@@ -29,7 +28,7 @@ license = "Same as Nmap--See https://nmap.org/book/man-legal.html"
 
 categories = {"default", "safe"}
 
-portrule = shortport.port_or_service({21, 990}, {"ftp", "ftps"})
+portrule = ftp.portrule
 
 local function get_portfmt()
   local arghost = stdnse.get_script_args(SCRIPT_NAME .. ".checkhost") or "scanme.nmap.org"

scripts/ftp-brute.nse

@@ -1,6 +1,5 @@
 local brute = require "brute"
 local creds = require "creds"
-local shortport = require "shortport"
 local stdnse = require "stdnse"
 local ftp = require "ftp"
 
@@ -37,7 +36,7 @@ author = "Aleksandar Nikolic"
 license = "Same as Nmap--See https://nmap.org/book/man-legal.html"
 categories = {"intrusive", "brute"}
 
-portrule = shortport.port_or_service(21, "ftp")
+portrule = ftp.portrule
 
 local arg_timeout = stdnse.parse_timespec(stdnse.get_script_args(SCRIPT_NAME .. ".timeout"))
 arg_timeout = (arg_timeout or 5) * 1000

scripts/ftp-libopie.nse

@@ -37,7 +37,7 @@ author = "Ange Gutek"
 license = "Same as Nmap--See https://nmap.org/book/man-legal.html"
 categories = {"vuln","intrusive"}
 
-
+-- TODO: use comm.lua or ftp.lua and add ftps
 portrule = shortport.port_or_service(21, "ftp")
 
 action = function(host, port)

scripts/ftp-proftpd-backdoor.nse

@@ -1,6 +1,5 @@
 local ftp = require "ftp"
 local nmap = require "nmap"
-local shortport = require "shortport"
 local stdnse = require "stdnse"
 
 -- -*- mode: lua -*-
@@ -48,7 +47,7 @@ portrule = function (host, port)
     return false
   end
 
-  return shortport.port_or_service(21, "ftp")(host, port)
+  return ftp.portrule(host, port)
 end
 
 action = function(host, port)

scripts/ftp-syst.nse

@@ -1,5 +1,4 @@
 local ftp = require "ftp"
-local shortport = require "shortport"
 local stdnse = require "stdnse"
 
 description = [[
@@ -63,7 +62,7 @@ categories = {"default", "discovery", "safe"}
 --  No data connection
 -- End of status</elem>
 
-portrule = shortport.port_or_service({21,990}, {"ftp","ftps"})
+portrule = ftp.portrule
 
 local function do_syst(socket, buffer)
 end

scripts/ftp-vsftpd-backdoor.nse

@@ -1,6 +1,5 @@
 local ftp = require "ftp"
 local nmap = require "nmap"
-local shortport = require "shortport"
 local stdnse = require "stdnse"
 local string = require "string"
 local table = require "table"
@@ -68,7 +67,7 @@ portrule = function (host, port)
     return false
   end
 
-  return shortport.port_or_service(21, "ftp")(host, port)
+  return ftp.portrule(host, port)
 end
 
 local function finish_ftp(socket, status, message)

scripts/ftp-vuln-cve2010-4221.nse

@@ -1,5 +1,4 @@
 local ftp = require "ftp"
-local shortport = require "shortport"
 local stdnse = require "stdnse"
 local string = require "string"
 local stringaux = require "stringaux"
@@ -54,7 +53,7 @@ portrule = function (host, port)
   if port.version.product ~= nil and port.version.product ~= "ProFTPD" then
     return false
   end
-  return shortport.port_or_service(21, "ftp")(host, port)
+  return ftp.portrule(host, port)
 end
 
 local function get_proftpd_banner(banner)

scripts/http-csrf.nse

@@ -57,7 +57,7 @@ local table = require "table"
 local string = require "string"
 local httpspider = require "httpspider"
 
-portrule = shortport.port_or_service( {80, 443}, {"http", "https"}, "tcp", "open")
+portrule = shortport.http
 
 -- Checks if this is really a token.
 isToken = function(value)

scripts/http-devframework.nse

@@ -48,7 +48,7 @@ local stdnse = require "stdnse"
 local httpspider = require "httpspider"
 local _G = require "_G"
 
-portrule = shortport.port_or_service( {80, 443}, {"http", "https"}, "tcp", "open")
+portrule = shortport.http
 
 local function loadFingerprints(filename)
 

scripts/http-dombased-xss.nse

@@ -67,7 +67,7 @@ JS_CALLS_PATTERNS = {
    'location',
 }
 
-portrule = shortport.port_or_service( {80, 443}, {"http", "https"}, "tcp", "open")
+portrule = shortport.http
 
 action = function(host, port)
 

scripts/http-domino-enum-passwords.nse

@@ -90,7 +90,7 @@ categories = {"intrusive", "auth"}
 dependencies = {"http-brute", "http-form-brute"}
 
 
-portrule = shortport.port_or_service({80, 443}, {"http","https"}, "tcp", "open")
+portrule = shortport.http
 
 --- Checks if the <code>path</code> require authentication
 --

scripts/http-errors.nse

@@ -42,7 +42,7 @@ local stdnse = require "stdnse"
 local table = require "table"
 local httpspider = require "httpspider"
 
-portrule = shortport.port_or_service( {80, 443}, {"http", "https"}, "tcp", "open")
+portrule = shortport.http
 
 local function compare(a, b)
   return a[1] < b[1]

scripts/http-feed.nse

@@ -33,7 +33,7 @@ local table = require "table"
 local string = require "string"
 local httpspider = require "httpspider"
 
-portrule = shortport.port_or_service( {80, 443}, {"http", "https"}, "tcp", "open")
+portrule = shortport.http
 
 FEEDS = { RSS = { search = { '<rss(.*)>' }, version = 'version=["\'](.-)["\']' },
           Atom = { search = { '<feed(.*)>' }, version = 'version=["\'](.-)["\']' },

scripts/http-fileupload-exploiter.nse

@@ -63,7 +63,7 @@ local shortport = require "shortport"
 local stdnse = require "stdnse"
 local table = require "table"
 
-portrule = shortport.port_or_service( {80, 443}, {"http", "https"}, "tcp", "open")
+portrule = shortport.http
 
 
 -- A list of payloads. The interpreted code in the 'content' variable should

scripts/http-form-brute.nse

@@ -109,7 +109,7 @@ license = "Same as Nmap--See https://nmap.org/book/man-legal.html"
 categories = {"intrusive", "brute"}
 
 
-portrule = shortport.port_or_service( {80, 443}, {"http", "https"}, "tcp", "open")
+portrule = shortport.http
 
 
 -- Miscellaneous script-wide constants

scripts/http-mobileversion-checker.nse

@@ -57,7 +57,7 @@ getLastLoc = function(host, port, useragent)
 
 end
 
-portrule = shortport.port_or_service( {80, 443}, {"http", "https"}, "tcp", "open")
+portrule = shortport.http
 
 action = function(host, port)
 

scripts/http-qnap-nas-info.nse

@@ -47,7 +47,7 @@ license = "Same as Nmap--See https://nmap.org/book/man-legal.html"
 categories = {"safe","discovery"}
 
 
-portrule = shortport.port_or_service ({443,8080}, "https", "tcp")
+portrule = shortport.http
 
 action = function(host, port)
 

scripts/http-referer-checker.nse

@@ -29,7 +29,7 @@ local stdnse = require "stdnse"
 local table = require "table"
 local httpspider = require "httpspider"
 
-portrule = shortport.port_or_service( {80, 443}, {"http", "https"}, "tcp", "open")
+portrule = shortport.http
 
 action = function(host, port)
 

scripts/http-rfi-spider.nse

@@ -177,7 +177,7 @@ local function check_responses(urls, responses)
   return suspects
 end
 
-portrule = shortport.port_or_service( {80, 443}, {"http", "https"}, "tcp", "open")
+portrule = shortport.http
 
 function action(host, port)
   inclusion_url = stdnse.get_script_args('http-rfi-spider.inclusionurl') or 'http://tools.ietf.org/html/rfc13?'

scripts/http-security-headers.nse

@@ -96,7 +96,7 @@ author = {"Icaro Torres", "Vinamra Bhatia"}
 license = "Same as Nmap--See https://nmap.org/book/man-legal.html"
 categories = {"discovery", "safe"}
 
-portrule = shortport.port_or_service({80,443}, "http", "tcp")
+portrule = shortport.http
 
 local function fail (err) return stdnse.format_output(false, err) end
 

scripts/http-sitemap-generator.nse

@@ -54,7 +54,7 @@ local httpspider = require 'httpspider'
 local string = require 'string'
 local table = require 'table'
 
-portrule = shortport.port_or_service( {80, 443}, {"http", "https"}, "tcp", "open")
+portrule = shortport.http
 
 local function dict_add(d, k, v)
   if not d[k] then

scripts/http-sql-injection.nse

@@ -61,7 +61,7 @@ categories = {"intrusive", "vuln"}
 --
 
 
-portrule = shortport.port_or_service({80, 443}, {"http","https"})
+portrule = shortport.http
 
 --[[
 Pattern match response from a submitted injection query to see

scripts/http-stored-xss.nse

@@ -65,7 +65,7 @@ local shortport = require "shortport"
 local stdnse = require "stdnse"
 local table = require "table"
 
-portrule = shortport.port_or_service( {80, 443}, {"http", "https"}, "tcp", "open")
+portrule = shortport.http
 
 
 -- A list of payloads.

scripts/http-useragent-tester.nse

@@ -105,7 +105,7 @@ getLastLoc = function(host, port, useragent)
 
 end
 
-portrule = shortport.port_or_service( {80, 443}, {"http", "https"}, "tcp", "open")
+portrule = shortport.http
 
 action = function(host, port)
 

scripts/telnet-brute.nse

@@ -34,7 +34,7 @@ author = "nnposter"
 license = "Same as Nmap--See https://nmap.org/book/man-legal.html"
 categories = {'brute', 'intrusive'}
 
-portrule = shortport.port_or_service(23, 'telnet')
+portrule = shortport.port_or_service({23, 992}, {'telnet', 'telnets'})
 
 
 -- Miscellaneous script-wide parameters and constants

scripts/telnet-ntlm-info.nse

@@ -75,13 +75,13 @@ local tnap_login_packet = string.pack("<BBBBBBB I4I4",
   .. ntlm_auth_blob .. string.pack("<BB",
   0xff, 0xf0) -- Sub-option End
 
-portrule = shortport.port_or_service(23, "telnet")
+portrule = shortport.port_or_service({23, 992}, {'telnet', 'telnets'})
 
 action = function(host, port)
 
   local output = stdnse.output_table()
 
-  local socket, response, early_resp = comm.opencon(host, port, tnap_login_packet, {recv_before=true})
+  local socket, response, _, early_resp = comm.tryssl(host, port, tnap_login_packet, {recv_before=true})
 
   if not socket then
     return nil