Merge pull request 'change drive filter for system drive' (#36) from develop into master

Reviewed-on: #36

.gitignore

@@ -42,3 +42,6 @@
 reHDD
 
 reHDD.log
+
+
+ignoreDrives.conf

README.md

@@ -14,28 +14,24 @@
 * clone repo
 * make release
 
-## Create Standalone with Debian
+## Create Standalone with Debian 11
 
 Instructions how to create a standalone machine that boots directly to reHDD. This is aimed for production use, like several drives a day shredding.
 
 ### Software requirements
 
-* apt-get install hwinfo
-* wget http://ftp.de.debian.org/debian/pool/main/s/smartmontools/smartmontools_7.1-1_amd64.deb
-* dpkg --install smartmontools_7.1-1_amd64.deb 
+* apt-get install hwinfo smartmontools curl
 
 ### Start reHDD after boot without login (as a tty shell)
 
-nano /etc/systemd/system/reHDD.service
-```
-[Unit]
-Description=Custom user interface on tty1
-Conflicts=getty@tty1.service
-Before=getty.target
+nano /lib/systemd/system/getty@.service 
 
+and replace the [Service] with this:
+```
 [Service]
 WorkingDirectory=/root/reHDD
-ExecStart=/root/reHDD/reHDD
+ExecStart=
+ExecStart=-/root/reHDD/reHDD
 StandardInput=tty
 StandardOutput=tty
 Restart=always
@@ -47,10 +43,10 @@ TTYVHangup=yes
 TTYVTDisallocate=yes
 SendSIGHUP=yes
 
-[Install]
-WantedBy=multi-user.target
 ```
 
+systemctl daemon-reload
+
 nano /etc/systemd/system/reHDDSettings.service 
 ```
 [Service]
@@ -66,14 +62,18 @@ nano /root/reHDDSettings.sh
 ```
 #!/bin/bash
 dmesg -n 1 #disable overlay if a drive is attached/detached
+# remove comment for the following to activate log telemetie
+# curl -k -T /root/reHDD/reHDD.log -u "fgggfffgfgfgfg:" -H 'X-Requested-With: XMLHttpRequest' https://schuttercloud.com/public.php/webdav/`echo $(date '+%Y-%m-%d_%H-%M')`_reHDD.log
 rm -f /root/reHDD/reHDD.log
 ```
+chmod +x reHDDSettings.sh
+
+
 Make sure the binary reHDD is in /root/reHDD/
+
 Add your system drive in /root/reHDD/ignoreDrives.conf like:
 ``` /dev/sdX:e102f49d-5ed5-462b-94c5-ef66a4345671```
 Get your UUID via blkid /dev/sdX
 
-systemctl enable reHDD.service
-
 systemctl enable reHDDSettings.service
 

include/reHDD.h

@@ -8,7 +8,7 @@
 #ifndef REHDD_H_
 #define REHDD_H_
 
-#define REHDD_VERSION "bV0.2.0"
+#define REHDD_VERSION "bV0.2.1"
 
 // Drive handling Settings
 #define WORSE_HOURS   19200 //mark drive if at this limit or beyond
@@ -18,7 +18,7 @@
 
 // Logger Settings
 #define LOG_PATH "./reHDD.log"
-#define DESCRIPTION "reHDD - Copyright Hendrik Schutter 2020"
+#define DESCRIPTION "reHDD - Copyright Hendrik Schutter 2022"
 #define DEVICE_ID  "generic"
 #define SOFTWARE_VERSION  "alpha"
 #define HARDWARE_VERSION  "generic"

src/delete.cpp

@@ -38,5 +38,5 @@ void Delete::deleteDrive(Drive* drive)
         {
             //wipefs running
         }
-    fclose(deleteCmdOutput);
+    pclose(deleteCmdOutput);
 }

src/drive.cpp

@@ -48,17 +48,17 @@ uint32_t Drive::getPowerCycles(void)
 
 string Drive::sCapacityToText()
 {
-    if(getCapacity() <= (999*1000000000UL))
-        {
-            // Less or even 999 GB --> GB
-            return  to_string(getCapacity() / 1000000000UL) + " GB";
-        }
-    else
-        {
-            // More 999 GB --> TB
-            return  to_string(getCapacity() / 1000000000000UL) + " TB";
-        }
-    return "ERROR";
+    char acBuffer[16];
+    double dSize = (double) getCapacity();
+    uint16_t u16UnitIndex = 0;
+    const char* units[] = {"B", "kB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"};
+    while (dSize >= 1000) { //using the marketing capacity 
+        dSize /= 1000;
+        u16UnitIndex++;
+    }
+
+    sprintf(acBuffer, "%.*f %s", u16UnitIndex-3, dSize, units[u16UnitIndex]);
+    return acBuffer;
 }
 
 string Drive::sErrorCountToText()

src/reHDD.cpp

@@ -289,30 +289,30 @@ void reHDD::filterNewDrives(list <Drive>* plistOldDrives, list <Drive>* plistNew
  */
 void reHDD::searchDrives(list <Drive>* plistDrives)
 {
-    // cout << "search drives ..." << endl;
     Logger::logThis()->info("-->    search drives   <--");
     char * cLine = NULL;
     size_t len = 0;
 
-    FILE* outputfileHwinfo = popen("ls -1 /dev/sd*", "r");
+    FILE* outputfileHwinfo = popen("lsblk -I 8 -d -o NAME", "r");
 
     if (outputfileHwinfo == NULL)
         {
-            Logger::logThis()->error("Unable to scann attached drives");
+            Logger::logThis()->error("Unable to scan attached drives");
             exit(EXIT_FAILURE);
         }
 
     while ((getline(&cLine, &len, outputfileHwinfo)) != -1)
         {
-            if (string(cLine).length() == 9)
+            if (string(cLine).length() == 4)
                 {
-                    Drive* tmpDrive = new Drive(string(cLine).substr(0, 8));
+                    Drive* tmpDrive = new Drive("/dev/" + string(cLine).substr(0, 3));
                     tmpDrive->state = Drive::NONE;
                     tmpDrive->bIsOffline = false;
                     plistDrives->push_back(*tmpDrive);
+                    //Logger::logThis()->info("drive found: " + tmpDrive->getPath());
                 }
         }
-    fclose(outputfileHwinfo);
+    pclose(outputfileHwinfo);
 }
 
 /**
@@ -322,29 +322,13 @@ void reHDD::searchDrives(list <Drive>* plistDrives)
  */
 void reHDD::filterIgnoredDrives(list <Drive>* plistDrives)
 {
-    string sDelimiter = ":";
-    string sIgnoredDrivePath;
-    string sIgnoredDriveUUID;
-
-    list<tuple<string, string>> vtlIgnoredDevices; //store drives from ingnore file
-
+    list<tuple<string>> vtlIgnoredDevices; //store drives from ingnore file
     ifstream input( "ignoreDrives.conf" ); //read ingnore file
 
     for(string sLine; getline( input, sLine );)
         {
-            if (string(sLine).find("/dev/sd") != string::npos)
-                {
-                    size_t pos = 0;
-                    string token;
-                    while ((pos = sLine.find(sDelimiter)) != string::npos)
-                        {
-                            token = sLine.substr(0, pos);
-                            sIgnoredDrivePath = token;
-                            sLine.erase(0, pos + sDelimiter.length());
-                            sIgnoredDriveUUID = sLine;
-                        } //end while
-                    vtlIgnoredDevices.emplace_back(sIgnoredDrivePath, sIgnoredDriveUUID); //add found path and uuid from ingnore file to vector
-                }
+            Logger::logThis()->info("read uuid: " + sLine);
+            vtlIgnoredDevices.emplace_back(sLine); //add found path and uuid from ignore file to vector
         }
     //loop through found entries in ingnore file
     for(auto row : vtlIgnoredDevices)
@@ -353,48 +337,39 @@ void reHDD::filterIgnoredDrives(list <Drive>* plistDrives)
             for (it = plistDrives->begin(); it != plistDrives->end(); ++it)
                 {
                     string sUUID;
-                    if (!get<0>(row).compare(it->getPath())) //find same drive based on path
+                    char * cLine = NULL;
+                    size_t len = 0;
+                    string sCMD = "blkid ";
+                    sCMD.append(it->getPath());
+                    //cout << "cmd: " << sCMD << endl;
+                    FILE* outputfileBlkid = popen(sCMD.c_str(), "r"); //get UUID from drive
+                    if (outputfileBlkid == NULL)
                         {
-                            char * cLine = NULL;
-                            size_t len = 0;
-                            string sCMD = "blkid ";
-                            sCMD.append(it->getPath());
-                            //cout << "cmd: " << sCMD << endl;
-                            FILE* outputfileBlkid = popen(sCMD.c_str(), "r"); //get UUID from drive
-                            if (outputfileBlkid == NULL)
-                                {
-                                    exit(EXIT_FAILURE);
-                                }
+                            exit(EXIT_FAILURE);
+                        }
 
-                            while ((getline(&cLine, &len, outputfileBlkid)) != -1) //parse UUID from blkid
+                    while ((getline(&cLine, &len, outputfileBlkid)) != -1) //parse UUID from blkid
+                        {
+                            if (string(cLine).find("PTUUID") != string::npos)
                                 {
-                                    if (string(cLine).find("PTUUID") != string::npos)
-                                        {
-                                            string sBlkidOut = string(cLine);
-                                            sBlkidOut.erase(0, 18);
-                                            sBlkidOut.erase(36, sBlkidOut.length() - 36);
-                                            sUUID = sBlkidOut;
-                                            //cout << "blkid uuid:" << sUUID << endl;
-                                        }
+                                    string sBlkidOut = string(cLine);
+                                    sBlkidOut.erase(0, 18);
+                                    sBlkidOut.erase(36, sBlkidOut.length() - 36);
+                                    sUUID = sBlkidOut;
+                                    //cout << "blkid uuid:" << sUUID << endl;
                                 }
-                            fclose(outputfileBlkid);
-                            //cout << "blkid uuid:" << sUUID << endl;
+                        }
+                    pclose(outputfileBlkid);
+                    //cout << "blkid uuid:" << sUUID << endl;
 
-                            if (get<1>(row).compare(sUUID)) //compare uuid from ignore file and uuid from drive
-                                {
-                                    cout << "[ERROR] different uuid found than in ignore file:" << it->getPath() << endl;
-                                    Logger::logThis()->error("[ERROR] different uuid found than in ignore file: " + it->getPath());
-                                    exit(EXIT_FAILURE); // exit to prevent accidentally shred a system drive
-                                }
-                            else
-                                {
-                                    // same uuid found than in ignore file --> ignore this drive
+                    if (!get<0>(row).compare(sUUID)) //compare uuid from ignore file and uuid from drive
+                        {
+                            // same uuid found than in ignore file --> ignore this drive
 #ifdef LOG_LEVEL_HIGH
-                                    Logger::logThis()->info("same uuid found than in ignore file --> ignore this drive: " + it->getPath());
+                            Logger::logThis()->info("same uuid found than in ignore file --> ignore this drive: " + it->getPath());
 #endif
-                                    it = plistDrives->erase(it);
-                                    it--;
-                                }
+                            it = plistDrives->erase(it);
+                            it--;
                         }
                 }
         }

src/smart.cpp

@@ -51,7 +51,7 @@ void SMART::readSMARTData(Drive* drive)
             SMART::parsePowerOnHours(sLine);
             SMART::parsePowerCycle(sLine);
         }
-    fclose(outputfileSmart);
+    pclose(outputfileSmart);
     drive->setDriveSMARTData(modelFamily, modelName, serial, capacity, errorCount, powerOnHours, powerCycle); //wirte data in drive
 }