Move NewTargets class to its own h/cc files

Makefile.in

@@ -107,11 +107,11 @@ NSE_OBJS+=nse_libssh2.o
 endif
 endif
 
-export SRCS = charpool.cc FingerPrintResults.cc FPEngine.cc FPModel.cc idle_scan.cc MACLookup.cc main.cc nmap.cc nmap_dns.cc nmap_error.cc nmap_ftp.cc NmapOps.cc NmapOutputTable.cc nmap_tty.cc osscan2.cc osscan.cc output.cc payload.cc portlist.cc portreasons.cc protocols.cc scan_engine.cc scan_engine_connect.cc scan_engine_raw.cc scan_lists.cc service_scan.cc services.cc Target.cc TargetGroup.cc targets.cc tcpip.cc timing.cc traceroute.cc utils.cc xml.cc $(NSE_SRC)
+export SRCS = charpool.cc FingerPrintResults.cc FPEngine.cc FPModel.cc idle_scan.cc MACLookup.cc main.cc nmap.cc nmap_dns.cc nmap_error.cc nmap_ftp.cc NmapOps.cc NmapOutputTable.cc nmap_tty.cc osscan2.cc osscan.cc output.cc payload.cc portlist.cc portreasons.cc protocols.cc scan_engine.cc scan_engine_connect.cc scan_engine_raw.cc scan_lists.cc service_scan.cc services.cc Target.cc NewTargets.cc TargetGroup.cc targets.cc tcpip.cc timing.cc traceroute.cc utils.cc xml.cc $(NSE_SRC)
 
-export HDRS = charpool.h FingerPrintResults.h FPEngine.h idle_scan.h MACLookup.h nmap_amigaos.h nmap_dns.h nmap_error.h nmap.h nmap_ftp.h NmapOps.h NmapOutputTable.h nmap_tty.h nmap_winconfig.h osscan2.h osscan.h output.h payload.h portlist.h portreasons.h protocols.h scan_engine.h scan_engine_connect.h scan_engine_raw.h service_scan.h scan_lists.h services.h TargetGroup.h Target.h targets.h tcpip.h timing.h traceroute.h utils.h xml.h $(NSE_HDRS)
+export HDRS = charpool.h FingerPrintResults.h FPEngine.h idle_scan.h MACLookup.h nmap_amigaos.h nmap_dns.h nmap_error.h nmap.h nmap_ftp.h NmapOps.h NmapOutputTable.h nmap_tty.h nmap_winconfig.h osscan2.h osscan.h output.h payload.h portlist.h portreasons.h protocols.h scan_engine.h scan_engine_connect.h scan_engine_raw.h service_scan.h scan_lists.h services.h NewTargets.h TargetGroup.h Target.h targets.h tcpip.h timing.h traceroute.h utils.h xml.h $(NSE_HDRS)
 
-OBJS = charpool.o FingerPrintResults.o FPEngine.o FPModel.o idle_scan.o MACLookup.o nmap_dns.o nmap_error.o nmap.o nmap_ftp.o NmapOps.o NmapOutputTable.o nmap_tty.o osscan2.o osscan.o output.o payload.o portlist.o portreasons.o protocols.o scan_engine.o scan_engine_connect.o scan_engine_raw.o scan_lists.o service_scan.o services.o TargetGroup.o Target.o targets.o tcpip.o timing.o traceroute.o utils.o xml.o $(NSE_OBJS)
+OBJS = charpool.o FingerPrintResults.o FPEngine.o FPModel.o idle_scan.o MACLookup.o nmap_dns.o nmap_error.o nmap.o nmap_ftp.o NmapOps.o NmapOutputTable.o nmap_tty.o osscan2.o osscan.o output.o payload.o portlist.o portreasons.o protocols.o scan_engine.o scan_engine_connect.o scan_engine_raw.o scan_lists.o service_scan.o services.o NewTargets.o TargetGroup.o Target.o targets.o tcpip.o timing.o traceroute.o utils.o xml.o $(NSE_OBJS)
 
 # %.o : %.cc -- nope this is a GNU extension
 .cc.o:

NewTargets.cc

@@ -0,0 +1,238 @@
+/***************************************************************************
+ * NewTargets.h -- The "NewTargets" class allows NSE scripts to add new *
+ * targets to the scan queue. *
+ ***********************IMPORTANT NMAP LICENSE TERMS************************
+ * *
+ * The Nmap Security Scanner is (C) 1996-2017 Insecure.Com LLC ("The Nmap *
+ * Project"). Nmap is also a registered trademark of the Nmap Project. *
+ * This program is free software; you may redistribute and/or modify it *
+ * under the terms of the GNU General Public License as published by the *
+ * Free Software Foundation; Version 2 ("GPL"), BUT ONLY WITH ALL OF THE *
+ * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. This guarantees your *
+ * right to use, modify, and redistribute this software under certain *
+ * conditions. If you wish to embed Nmap technology into proprietary *
+ * software, we sell alternative licenses (contact [email protected]). *
+ * Dozens of software vendors already license Nmap technology such as *
+ * host discovery, port scanning, OS detection, version detection, and *
+ * the Nmap Scripting Engine. *
+ * *
+ * Note that the GPL places important restrictions on "derivative works", *
+ * yet it does not provide a detailed definition of that term. To avoid *
+ * misunderstandings, we interpret that term as broadly as copyright law *
+ * allows. For example, we consider an application to constitute a *
+ * derivative work for the purpose of this license if it does any of the *
+ * following with any software or content covered by this license *
+ * ("Covered Software"): *
+ * *
+ * o Integrates source code from Covered Software. *
+ * *
+ * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db *
+ * or nmap-service-probes. *
+ * *
+ * o Is designed specifically to execute Covered Software and parse the *
+ * results (as opposed to typical shell or execution-menu apps, which will *
+ * execute anything you tell them to). *
+ * *
+ * o Includes Covered Software in a proprietary executable installer. The *
+ * installers produced by InstallShield are an example of this. Including *
+ * Nmap with other software in compressed or archival form does not *
+ * trigger this provision, provided appropriate open source decompression *
+ * or de-archiving software is widely available for no charge. For the *
+ * purposes of this license, an installer is considered to include Covered *
+ * Software even if it actually retrieves a copy of Covered Software from *
+ * another source during runtime (such as by downloading it from the *
+ * Internet). *
+ * *
+ * o Links (statically or dynamically) to a library which does any of the *
+ * above. *
+ * *
+ * o Executes a helper program, module, or script to do any of the above. *
+ * *
+ * This list is not exclusive, but is meant to clarify our interpretation *
+ * of derived works with some common examples. Other people may interpret *
+ * the plain GPL differently, so we consider this a special exception to *
+ * the GPL that we apply to Covered Software. Works which meet any of *
+ * these conditions must conform to all of the terms of this license, *
+ * particularly including the GPL Section 3 requirements of providing *
+ * source code and allowing free redistribution of the work as a whole. *
+ * *
+ * As another special exception to the GPL terms, the Nmap Project grants *
+ * permission to link the code of this program with any version of the *
+ * OpenSSL library which is distributed under a license identical to that *
+ * listed in the included docs/licenses/OpenSSL.txt file, and distribute *
+ * linked combinations including the two. *
+ * *
+ * The Nmap Project has permission to redistribute Npcap, a packet *
+ * capturing driver and library for the Microsoft Windows platform. *
+ * Npcap is a separate work with it's own license rather than this Nmap *
+ * license. Since the Npcap license does not permit redistribution *
+ * without special permission, our Nmap Windows binary packages which *
+ * contain Npcap may not be redistributed without special permission. *
+ * *
+ * Any redistribution of Covered Software, including any derived works, *
+ * must obey and carry forward all of the terms of this license, including *
+ * obeying all GPL rules and restrictions. For example, source code of *
+ * the whole work must be provided and free redistribution must be *
+ * allowed. All GPL references to "this License", are to be treated as *
+ * including the terms and conditions of this license text as well. *
+ * *
+ * Because this license imposes special exceptions to the GPL, Covered *
+ * Work may not be combined (even as part of a larger work) with plain GPL *
+ * software. The terms, conditions, and exceptions of this license must *
+ * be included as well. This license is incompatible with some other open *
+ * source licenses as well. In some cases we can relicense portions of *
+ * Nmap or grant special permissions to use it in other open source *
+ * software. Please contact [email protected] with any such requests. *
+ * Similarly, we don't incorporate incompatible open source software into *
+ * Covered Software without special permission from the copyright holders. *
+ * *
+ * If you have any questions about the licensing restrictions on using *
+ * Nmap in other works, are happy to help. As mentioned above, we also *
+ * offer alternative license to integrate Nmap into proprietary *
+ * applications and appliances. These contracts have been sold to dozens *
+ * of software vendors, and generally include a perpetual license as well *
+ * as providing for priority support and updates. They also fund the *
+ * continued development of Nmap. Please email [email protected] for further *
+ * information. *
+ * *
+ * If you have received a written license agreement or contract for *
+ * Covered Software stating terms other than these, you may choose to use *
+ * and redistribute Covered Software under those terms instead of these. *
+ * *
+ * Source is provided to this software because we believe users have a *
+ * right to know exactly what a program is going to do before they run it. *
+ * This also allows you to audit the software for security holes. *
+ * *
+ * Source code also allows you to port Nmap to new platforms, fix bugs, *
+ * and add new features. You are highly encouraged to send your changes *
+ * to the [email protected] mailing list for possible incorporation into the *
+ * main distribution. By sending these changes to Fyodor or one of the *
+ * Insecure.Org development mailing lists, or checking them into the Nmap *
+ * source code repository, it is understood (unless you specify *
+ * otherwise) that you are offering the Nmap Project the unlimited, *
+ * non-exclusive right to reuse, modify, and relicense the code. Nmap *
+ * will always be available Open Source, but this is important because *
+ * the inability to relicense code has caused devastating problems for *
+ * other Free Software projects (such as KDE and NASM). We also *
+ * occasionally relicense the code to third parties as discussed above. *
+ * If you wish to specify special license conditions of your *
+ * contributions, just say so when you send them. *
+ * *
+ * This program is distributed in the hope that it will be useful, but *
+ * WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap *
+ * license file for more details (it's in a COPYING file included with *
+ * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) *
+ * *
+ ***************************************************************************/
+
+/* $Id$ */
+
+#include "NewTargets.h"
+#include "NmapOps.h"
+#include "output.h"
+#include "nmap_error.h"
+
+extern NmapOps o; /* option structure */
+NewTargets *NewTargets::new_targets;
+
+/* debug level for the adding target is: 3 */
+NewTargets *NewTargets::get (void) {
+ if (new_targets)
+ return new_targets;
+ new_targets = new NewTargets();
+ return new_targets;
+}
+
+NewTargets::NewTargets (void) {
+ Initialize();
+}
+
+void NewTargets::Initialize (void) {
+ history.clear();
+ while (!queue.empty())
+ queue.pop();
+}
+
+/* This private method is used to push new targets to the
+ * queue. It returns the number of targets in the queue. */
+unsigned long NewTargets::push (const char *target) {
+ std::pair<std::set<std::string>::iterator, bool> pair_iter;
+ std::string tg(target);
+
+ if (tg.length() > 0) {
+ /* save targets in the scanned history here (NSE side). */
+ pair_iter = history.insert(tg);
+
+ /* A new target */
+ if (pair_iter.second == true) {
+ /* push target onto the queue for future scans */
+ queue.push(tg);
+
+ if (o.debugging > 2)
+ log_write(LOG_PLAIN, "New Targets: target %s pushed onto the queue.\n", tg.c_str());
+ } else {
+ if (o.debugging > 2)
+ log_write(LOG_PLAIN, "New Targets: target %s is already in the queue.\n", tg.c_str());
+ /* Return 1 when the target is already in the history cache,
+ * this will prevent returning 0 when the target queue is
+ * empty since no target was added. */
+ return 1;
+ }
+ }
+
+ return queue.size();
+}
+
+/* Reads a target from the queue and return it to be pushed
+ * onto Nmap scan queue */
+std::string NewTargets::read (void) {
+ std::string str;
+
+ /* check to see it there are targets in the queue */
+ if (!new_targets->queue.empty()) {
+ str = new_targets->queue.front();
+ new_targets->queue.pop();
+ }
+
+ return str;
+}
+
+void NewTargets::clear (void) {
+ new_targets->history.clear();
+}
+
+unsigned long NewTargets::get_number (void) {
+ return new_targets->history.size();
+}
+
+unsigned long NewTargets::get_scanned (void) {
+ return new_targets->history.size() - new_targets->queue.size();
+}
+
+unsigned long NewTargets::get_queued (void) {
+ return new_targets->queue.size();
+}
+
+/* This is the function that is used by nse_nmaplib.cc to add
+ * new targets.
+ * Returns the number of targets in the queue on success, or 0 on
+ * failures or when the queue is empty. */
+unsigned long NewTargets::insert (const char *target) {
+ if (*target) {
+ if (new_targets == NULL) {
+ error("ERROR: to add targets run with -sC or --script options.");
+ return 0;
+ }
+ if (o.current_scantype == SCRIPT_POST_SCAN) {
+ error("ERROR: adding targets is disabled in the Post-scanning phase.");
+ return 0;
+ }
+ if (strlen(target) >= 1024) {
+ error("ERROR: new target is too long (>= 1024), failed to add it.");
+ return 0;
+ }
+ }
+
+ return new_targets->push(target);
+}