v1.0.4 : Fixed nmap package detection

CMakeLists.txt

@@ -19,9 +19,11 @@ set (PROJECT_NAME cameradar)
 
 project (${PROJECT_NAME})
 
+message ("Here")
+
 set (${PROJECT_NAME}_VERSION_MAJOR 1)
 set (${PROJECT_NAME}_VERSION_MINOR 0)
-set (${PROJECT_NAME}_VERSION_PATCH 0)
+set (${PROJECT_NAME}_VERSION_PATCH 4)
 set (${PROJECT_NAME}_SUFFIX "-beta")
 set (${PROJECT_NAME}_VERSION "${${PROJECT_NAME}_VERSION_MAJOR}.${${PROJECT_NAME}_VERSION_MINOR}.${${PROJECT_NAME}_VERSION_PATCH}${${PROJECT_NAME}_SUFFIX}")
 
@@ -103,6 +105,7 @@ set (${CAMERADAR_LIBRARIES} "")
 
 #build cache managers
 add_subdirectory (deps)
+message ("Debug")
 add_subdirectory (cameradar_standalone)
 add_subdirectory (cache_managers)
 

README.md

@@ -3,7 +3,7 @@
 ## An RTSP surveillance camera access multitool
 
 [![cameradar License](https://img.shields.io/badge/license-Apache-blue.svg)](#license)
-[![Latest release](https://img.shields.io/badge/release-1.0.0-green.svg)](https://github.com/EtixLabs/cameradar/releases/latest)
+[![Latest release](https://img.shields.io/badge/release-1.0.4-green.svg)](https://github.com/EtixLabs/cameradar/releases/latest)
 
 
 #### Cameradar allows you to:
@@ -70,6 +70,7 @@ To install Cameradar you will need these packages
 * git (`git`)
 * gstreamer1.x (`libgstreamer1.0-dev`)
 * ffmpeg (`ffmpeg`)
+* boost (`libboost-all-dev`)
 * libcurl (`libcurl4-openssl-dev`)
 
 ### Steps
@@ -127,7 +128,8 @@ The subnetworks should be passed separated by commas only, and their subnet form
 "subnets" : "172.100.16.0/24,172.100.17.0/24,localhost,192.168.1.13"
 ```
 
-The **RTSP ports for most cameras are 554**, so you should probably specify 554 as one of the ports you scan. Not giving any ports in the configuration will scan every port of every host found on the subnetworks..How is formatted Cameradar's result
+The **RTSP ports for most cameras are 554**, so you should probably specify 554 as one of the ports you scan. Not giving any ports in the configuration will scan every port of every host found on the subnetworks.
+
 You **can use your own files for the ids and routes dictionaries** used to bruteforce the cameras, but the Cameradar repo already gives you a good base that works with most cameras.
 
 The thumbnail storage path should be a **valid and accessible directory** in which the thumbnails will be stored.

cache_managers/mysql_cache_manager/src/mysql_cache_manager.cpp

@@ -149,28 +149,33 @@ void
 mysql_cache_manager::set_streams(std::vector<etix::cameradar::stream_model> models) {
     LOG_DEBUG_("Beginning stream list DB insertion", "mysql_cache_manager");
     for (const auto& model : models) {
-        auto query = tool::fmt(
-            this->exist_query, this->connection.get_db_name().c_str(), model.address.c_str());
-        auto result = this->connection.query(query);
-        // If an entry already exists for this address in the database,
-        // no need to insert it.
-        if (result.data->next()) return;
+        if (!model.service_name.compare("rtsp") && !model.state.compare("open")) {
+          auto query = tool::fmt(
+              this->exist_query, this->connection.get_db_name().c_str(), model.address.c_str());
+          auto result = this->connection.query(query);
+          // If an entry already exists for this address in the database,
+          // no need to insert it.
 
-        query = tool::fmt(this->insert_with_id_query,
-                          this->connection.get_db_name().c_str(),
-                          model.address.c_str(),
-                          model.password.c_str(),
-                          model.product.c_str(),
-                          model.protocol.c_str(),
-                          model.route.c_str(),
-                          model.service_name.c_str(),
-                          model.state.c_str(),
-                          model.thumbnail_path.c_str(),
-                          model.username.c_str(),
-                          std::to_string(model.port).c_str(),
-                          std::to_string(model.ids_found).c_str(),
-                          std::to_string(model.path_found).c_str());
-        execute_query(query);
+          // TODO : Update an entry if it already exists.
+
+          if (result.data->next()) return;
+
+          query = tool::fmt(this->insert_with_id_query,
+                            this->connection.get_db_name().c_str(),
+                            model.address.c_str(),
+                            model.password.c_str(),
+                            model.product.c_str(),
+                            model.protocol.c_str(),
+                            model.route.c_str(),
+                            model.service_name.c_str(),
+                            model.state.c_str(),
+                            model.thumbnail_path.c_str(),
+                            model.username.c_str(),
+                            std::to_string(model.port).c_str(),
+                            std::to_string(model.ids_found).c_str(),
+                            std::to_string(model.path_found).c_str());
+          execute_query(query);
+      }
     }
 }
 

cameradar_standalone/include/dispatcher.h

@@ -64,7 +64,7 @@ public:
                const std::pair<bool, etix::tool::opt_parse>& opts)
     : busy(false)
     , current(task::init)
-    , nmap_output("scans/scan" + std::to_string(std::chrono::system_clock::to_time_t(
+    , nmap_output("/tmp/scans/scan" + std::to_string(std::chrono::system_clock::to_time_t(
                                std::chrono::system_clock::now())) +
                   ".xml")
     , conf(conf)

cameradar_standalone/src/tasks/brutelogs.cpp

@@ -42,16 +42,16 @@ brutelogs::test_ids(const etix::cameradar::stream_model& stream,
             LOG_DEBUG_("[FOUND IDS] : " + path, "brutelogs");
             found = true;
             stream_model newstream{
-                stream.address, stream.port,         username,       password,
-                stream.route,   stream.service_name, stream.product, stream.protocol,
-                stream.state,   stream.path_found,   true,           stream.thumbnail_path
+                stream.address, stream.port,         username,          password,
+                stream.route,   stream.service_name, stream.product,    stream.protocol,
+                stream.state,   true,                stream.path_found, stream.thumbnail_path
             };
             (*cache)->update_stream(newstream);
         } else {
-            stream_model newstream{ stream.address,    stream.port,     username,
-                                    password,          stream.route,    stream.service_name,
-                                    stream.product,    stream.protocol, stream.state,
-                                    stream.path_found, false,           stream.thumbnail_path };
+            stream_model newstream{ stream.address,    stream.port,       username,
+                                    password,          stream.route,      stream.service_name,
+                                    stream.product,    stream.protocol,   stream.state,
+                                    false,             stream.path_found, stream.thumbnail_path };
             (*cache)->update_stream(newstream);
         }
     } catch (const std::runtime_error& e) {
@@ -77,6 +77,7 @@ brutelogs::run() const {
         "take a while.",
         "brutelogs");
     std::vector<etix::cameradar::stream_model> streams = (*cache)->get_streams();
+    LOG_DEBUG_("Found " + std::to_string(streams.size()) + " streams in the cache", "brutelogs");
     bool doubleskip;
     size_t found = 0;
     for (const auto& stream : streams) {

cameradar_standalone/src/tasks/mapping.cpp

@@ -29,11 +29,8 @@ namespace cameradar {
 bool
 nmap_is_ok() {
     return (
-        launch_command("test `dpkg -l | cut -c 5-9 | grep nmap` = nmap")
-        // && launch_command("test `nmap --version | cut -c 14-18  | head -n2 | tail -n1` = 6.47")
-        &&
-        launch_command(
-            "mkdir -p scans")); // Creates the directory in which the scans will be stored
+        (system("dpkg -l | cut -c 5-9 | grep nmap") == 0)
+        && launch_command("mkdir -p /tmp/scans")); // Creates the directory in which the scans will be stored
 }
 
 //! Launches and checks the return of the nmap command

cameradar_standalone/src/tasks/parsing.cpp

@@ -27,9 +27,9 @@ static const std::string no_hosts_found_ =
 //! Avoids segfaults on unknown xml structure
 std::string
 xml_safe_get(const TiXmlElement* elem, const std::string& attr) {
-    if (elem == nullptr) return "Closed";
+    if (elem == nullptr) return "closed";
     if (elem->Attribute(attr.c_str()) != nullptr) return std::string(elem->Attribute(attr.c_str()));
-    return "Closed";
+    return "closed";
 }
 
 //! Parse a single host node (generally containing only one camera)
@@ -51,8 +51,8 @@ parsing::parse_camera(TiXmlElement* xml_host, std::vector<stream_model>& data) c
             stream.service_name = xml_safe_get(service, "name");
             stream.product = xml_safe_get(service, "product");
         } else {
-            stream.service_name = "Closed";
-            stream.product = "Closed";
+            stream.service_name = "closed";
+            stream.product = "closed";
         }
         data.push_back(stream);
     }

cameradar_standalone/src/tasks/stream_check.cpp

@@ -29,18 +29,25 @@ stream_check::run() const {
 
     std::vector<stream_model> streams = (*cache)->get_valid_streams();
 
+    if (not streams.size()) {
+      LOG_WARN_("There were no valid streams to check. Cameradar will stop.", "stream_check");
+      return false;
+    }
     for (const auto& stream : streams) {
         GError* error = NULL;
 
         pipeline =
             gst_parse_launch("rtspsrc name=source ! rtph264depay ! h264parse ! fakesink", &error);
 
+        std::string location = "rtsp://";
+        location += stream.username + ":" + stream.password + "@" + stream.address + ":" + std::to_string(stream.port);
         if (pipeline == NULL) {
             LOG_ERR_("[" + stream.address + "] Can't configure pipeline", "stream_check");
             return false;
         } else {
             elem = gst_bin_get_by_name(GST_BIN(pipeline), "source");
-            g_object_set(G_OBJECT(elem), "location", stream.address, "latency", 20, NULL);
+            LOG_DEBUG_("Launching gstreamer check on rtsp://" + stream.username + ":" + stream.password + "@" + stream.address + ":" + std::to_string(stream.port), "gstreamer check");
+            g_object_set(G_OBJECT(elem), "location", location.c_str(), "latency", 20, NULL);
 
             if (gst_element_set_state(pipeline, GST_STATE_PLAYING) == GST_STATE_CHANGE_FAILURE) {
                 LOG_ERR_(

cameradar_standalone/src/tasks/thumbnail.cpp

@@ -48,7 +48,12 @@ bool
 thumbnail::run() const {
     std::vector<stream_model> streams = (*cache)->get_valid_streams();
     LOG_INFO_("Started thumbnail generation, it may take a while", "thumbnail");
+    if (not streams.size()) {
+      LOG_WARN_("There were no valid streams to generate thumbnails from. Cameradar will stop.", "thumbnail_generation");
+      return false;
+    }
     for (const auto& stream : streams) {
+      LOG_DEBUG_("Generating thumbnail for " + stream.address, "thumbnail_generation");
         if (signal_handler::instance().should_stop() != etix::cameradar::stop_priority::running)
             break;
         std::string ffmpeg_cmd =

cmake/boost.cmake

@@ -1,91 +0,0 @@
-## Copyright 2016 Etix Labs
-##
-## Licensed under the Apache License, Version 2.0 (the "License");
-## you may not use this file except in compliance with the License.
-## You may obtain a copy of the License at
-##
-##     http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-
-message(STATUS "Configuring deps.boost")
-
-set(BOOST_VERSION 1.60.0)
-# set(BoostSHA1 2fc96c1651ac6fe9859b678b165bd78dc211e881)
-
-# Set up general b2 (bjam) command line arguments
-set(b2Args <SOURCE_DIR>/b2
-           # link=static
-           threading=multi
-           runtime-link=shared
-           --layout=tagged
-           --build-dir=build
-           --without-wave
-           --without-python
-           stage
-           -d+2
-)
-
-if(TARGET_ARCH STREQUAL "x86_64")
-    list(APPEND b2Args address-model=64)
-endif()
-
-string(REPLACE "." "_" BOOST_VERSION_UNDERSCORE ${BOOST_VERSION})
-
-set(BOOST_DIR boost)
-set(BOOST_PATH ${DEPS_DIR}/${BOOST_DIR})
-
-# Set up build steps
-include(ExternalProject)
-ExternalProject_Add(
-    deps.boost
-    PREFIX ${BOOST_PATH}
-    URL http://sourceforge.net/projects/boost/files/boost/${BOOST_VERSION}/boost_${BOOST_VERSION_UNDERSCORE}.tar.bz2/download
-    TIMEOUT 600
-    CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory <SOURCE_DIR>/build
-    BUILD_COMMAND "${b2Args}"
-    # BUILD_COMMAND "<SOURCE_DIR>/b2 address-model=64 threading=multi runtime-link=shared --layout=tagged --build-dir=<SOURCE_DIR>/build"
-    BUILD_IN_SOURCE ON
-    INSTALL_COMMAND ""
-    # INSTALL_COMMAND <SOURCE_DIR>/b2 install --prefix=${BOOST_PATH}
-    LOG_DOWNLOAD ON
-    LOG_UPDATE ON
-    LOG_CONFIGURE ON
-    LOG_BUILD ON
-    LOG_TEST ON
-    LOG_INSTALL ON
-)
-
-# Set extra step to build b2 (bjam)
-set(b2Bootstrap "./bootstrap.sh")
-ExternalProject_Add_Step(
-    deps.boost
-    make_b2
-    COMMAND ${b2Bootstrap}
-    COMMENT "Building b2..."
-    DEPENDEES download
-    DEPENDERS configure
-    WORKING_DIRECTORY <SOURCE_DIR>
-    LOG ON
-)
-
-
-ExternalProject_Get_Property(deps.boost SOURCE_DIR)
-set(BOOST_INCLUDE_DIR ${SOURCE_DIR} PARENT_SCOPE)
-set(BOOST_LIBRARY_DIR "${SOURCE_DIR}/stage/lib")
-set(BOOST_LIBRARY_DIR ${BOOST_LIBRARY_DIR} PARENT_SCOPE)
-
-# list all the boost libraries .dylib/.so
-file(GLOB BOOST_INSTALL_DEPENDENCIES "${BOOST_LIBRARY_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}boost_*${CMAKE_SHARED_LIBRARY_SUFFIX}")
-list (APPEND CAMERADAR_INSTALL_DEPENDENCIES ${BOOST_INSTALL_DEPENDENCIES})
-# on linux
-if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
-  file(GLOB BOOST_INSTALL_DEPENDENCIES "${BOOST_LIBRARY_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}boost_*${CMAKE_SHARED_LIBRARY_SUFFIX}.${BOOST_VERSION}")
-  list (APPEND CAMERADAR_INSTALL_DEPENDENCIES ${BOOST_INSTALL_DEPENDENCIES})
-endif()
-
-set(CAMERADAR_INSTALL_DEPENDENCIES ${CAMERADAR_INSTALL_DEPENDENCIES} PARENT_SCOPE)

deployment/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:15.10
+FROM ubuntu:16.04
 
 MAINTAINER brendan.leglaunec@etixgroup.com
 
@@ -7,11 +7,12 @@ ENV LD_LIBRARY_PATH="/cameradar/libraries"
 RUN apt-get update && apt-get install -y \
     nmap \
     ffmpeg \
+    libboost-all-dev \
     libgstreamer1.0-dev \
     gstreamer1.0-plugins-base \
     gstreamer1.0-plugins-good \
     libcurl4-openssl-dev \
-    libmysqlclient18 \
+    libmysqlclient20 \
     mysql-client
 
 ADD cameradar_*_Release_Linux.tar.gz /

deps/CMakeLists.txt

@@ -17,7 +17,6 @@ cmake_minimum_required (VERSION 2.8.1)
 # Lib subdirectory
 
 include (jsoncpp)
-include (boost)
 include (mysql_connector)
 
 set_directory_properties(PROPERTIES CLEAN_NO_CUSTOM ON)