Merge branch 'pu/ATBUpdateDC_CommandLineParameter'

-> remove wrong default values.
 -> remove dependency for certain host-names

ATBUpdateTool.ini

@@ -9,7 +9,7 @@ psa-tariff-directory="etc/psa_tariff/"
 
 
 [PLUGINS]
-plugin-name="libCAmaster.so"
+plugin-name="libCAslave.so"
 
 [FLAGS]
 no-psa-hardware-update=false

ATBUpdateTool.pro

@@ -1,4 +1,3 @@
 TEMPLATE = subdirs
 CONFIG += ordered
-#SUBDIRS = DownloadDCFirmware DownloadDCJsonFiles UpdatePTUDevCtrl
-SUBDIRS = UpdatePTUDevCtrl
+SUBDIRS = DownloadDCFirmware DownloadDCJsonFiles UpdatePTUDevCtrl

DownloadDCFirmware/DownloadDCFirmware.pro

@@ -2,9 +2,6 @@ QT += core serialport
 
 TARGET = ATBUpdateDC
 
-include(../common.pri)
-
-
 VERSION="0.1.0"
 win32 {
     BUILD_DATE=$$system("date /t")
@@ -101,9 +98,6 @@ OTHER_FILES += \
     ../ATBUpdateTool.ini
 
 
-FORMS += \
-    mainwindow.ui
-
 ##########################################################################################
 # for running program on target through QtCreator
 contains( CONFIG, PTU5 ) {

DownloadDCFirmware/main.cpp

@@ -4,7 +4,6 @@
 #include <QByteArray>
 
 #include <QProcess>
-#include <QCommandLineParser>
 #include <QStandardPaths>
 #include <QSettings>
 #include <QDir>
@@ -65,9 +64,7 @@ int main(int argc, char **argv) {
         setDebugLevel(LOG_NOTICE);
     }
 
-    //return 0;
-
-/*
+    /*
     CommandLineParser parser;
     parser.process(a);
     parser.readSettings();
@@ -129,21 +126,13 @@ int main(int argc, char **argv) {
         printf(APP_EXTENDED_VERSION"\n");
         return 0;
     }
-
-    QString const &customerRepo
-        = QDir::cleanPath(workingDir + QDir::separator() + QString("customer_%1").arg(customerNr));
-*/
-
-    QString const &psaDcDir = internal::customerRepoDcDir();
-    QString const &psaRepoRootDir = internal::customerRepoRoot();
-    QString const &psaRepoDir = internal::customerRepoDir();
-    QString const &branchName = internal::branchName();
+    */
 
     bool debug = false;
     bool noaction = true;
-    QString workingDir;
     QString libDir;
     QString libca;
+    QString workingDir;
 
     std::unique_ptr<QSettings> settings = internal::readSettings();
 
@@ -162,37 +151,37 @@ int main(int argc, char **argv) {
         settings->endGroup();
     }
 
-    // etc/dc: located under mount-path
-    std::optional<QString> mountPath = System::checkForUSBStick(psaDcDir);
     QFileInfo fi;
-    if (mountPath.has_value()) {
-        fi.setFile(mountPath.value(), System::getDCFileOnUsbStick(mountPath.value()));
-    } else
-    if ((mountPath = System::checkForSDCard(psaDcDir)).has_value()) {
-        fi.setFile(mountPath.value(), System::getDCFileOnSDCard(mountPath.value()));
-    } else {
 
-        if (debug) {
-            qInfo() << "using customer repository" << psaRepoDir;
+    // ------------------- single command line argument is DC-firmware binary file -----------------
+    QStringList args = a.arguments();
+    if (args.size() != 2)    {
+        qCritical() << "ERROR: missing parameter <dc-firmware>";
+        exit(1);
     }
 
-        std::unique_ptr<QString> c = internal::dcCandidateToInstall("/etc/dc/");
-        if (c) {
-            fi.setFile(*c);
-            if (fi.exists() == false) {
-                qCritical() << "dc2c.bin candidate" << *c << "does not exist. STOP.";
-                return -1;
-            }
-            qInfo() << "dc2c.bin canditate" << fi.absoluteFilePath();
-        }
+    qCritical() << "------------------------------------------------------";
+    qCritical() << "main: argument dc-firmware: " << args.at(1);
+    qCritical() << "------------------------------------------------------";
+
+    fi.setFile(args.at(1));
+
+    if (!fi.isFile()) {
+        qCritical() << "ERROR: parameter " << fi.absoluteFilePath() << " is not a file";
+        exit(1);
     }
 
-    if (debug) {
-        qInfo() << "downloading dc-firmware" << fi.absoluteFilePath();
-        qInfo() << "dc-firmware size (bytes)" << fi.size();
-        qInfo() << "dc-version" << Update::dcVersion(fi.absoluteFilePath());
+    if (!fi.isReadable()) {
+        qCritical() << "ERROR: parameter " << fi.absoluteFilePath() << " is not readable";
+        exit(1);
     }
 
+    qCritical() << "------------------------------------------------------";
+    qCritical() << "uploading dc-firmware" << fi.absoluteFilePath();
+    qCritical() << "dc-firmware size (bytes)" << fi.size();
+    qCritical() << "dc-version" << Update::dcVersion(fi.absoluteFilePath());
+    qCritical() << "------------------------------------------------------";
+
     Update u(fi.absoluteFilePath(), libca, debug, noaction);
     u.run();
 

DownloadDCFirmware/update.cpp

@@ -397,9 +397,7 @@ int Update::run() {
         qInfo() << "<DC-VERSION>" << Update::dcVersion(m_dcFileName);
     }
 
-    if (!m_debug) {
     m_hw->dc_autoRequest(false);
-    }
 
     qInfo() << "DC auto request OFF";
 

DownloadDCJsonFiles/DownloadDCJsonFiles.pro

@@ -1,8 +1,6 @@
 QT += core
 QT += serialport network
 
-include(../common.pri)
-
 TARGET = ATBDownloadDCJsonFiles
 
 VERSION="0.1.0"

UpdatePTUDevCtrl/UpdatePTUDevCtrl.pro

@@ -1,8 +1,6 @@
 QT += core gui
 QT += widgets serialport network
 
-include(../common.pri)
-
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
 TARGET = ATBUpdateTool
@@ -152,10 +150,7 @@ DEFINES += QT_DEPRECATED_WARNINGS
 # 1.5.7   : Add support for dynamic portrait / landscape.
 # 1.5.8   : Use EVENT_ID=<pid of update-tool> for CMD_EVENT.
 # 1.5.9   : Removed restart of Apism if ISMAS unreachable.
-# 1.5.99  : Special version for 281/Szeged: remove all DC-library dependencies, as
-#           DC-firmware in Szeged does not support uploading json-files or uploading
-#           DC-firmware binaries.
-VERSION="1.5.99"
+VERSION="1.5.9"
 # PLANNED TODOS:
 #   1:  Das Repository wird repariert bwz. neu geklont. Unabhaengig vom WAIT.
 #   2:  Wenn der WAIT-Button aktiv ist, dann wird ein Repository repariert (neu
@@ -261,6 +256,9 @@ contains( CONFIG, PTU5_YOCTO ) {
     PTU5BASEPATH = /opt/devel/ptu5
     ARCH = PTU5
     DEFINES+=PTU5
+
+    LIBS += -lCAslave
+    LIBS += -lCAmaster
 }
 contains( CONFIG, DesktopLinux ) {
     greaterThan(QT_MAJOR_VERSION, 4): QT += serialport

UpdatePTUDevCtrl/commandline_parser.cpp

@@ -6,7 +6,9 @@
 #include <QFile>
 
 CommandLineParser::CommandLineParser()
-  : m_repositoryUrl("https://git.mimbach49.de/GerhardHoffmann")
+  : m_repositoryUrl("gitea@ptu-config.atb-comm.de:ATB/")
+  , m_sshKeyFile("/opt/app/tools/atbupdate/.keys/id_ed25519_ptuConfig")
+  , m_sshOptionStrictHostKeyChecking("false")
   , m_plugInDir("/usr/lib/")
   , m_plugInName("libCAslave.so")
   , m_workingDir("/opt/app/tools/atbupdate/")
@@ -20,27 +22,36 @@ CommandLineParser::CommandLineParser()
   , m_alwaysDownloadDC("false")
   , m_repositoryUrlOption(
         QCommandLineOption(
-            QStringList() << "repository-url" << "repository-url",
+            QStringList() << "repository-url",
             QCoreApplication::translate("main", "Where to find a customer repository."),
             QCoreApplication::translate("main", "directory")))
+  , m_sshKeyFileOption(
+        QCommandLineOption(
+            QStringList() << "sshKeyFile",
+            QCoreApplication::translate("main", "Used ssh key."),
+            QCoreApplication::translate("main", "file")))
+  , m_sshOptionStrictHostKeyCheckingOption(
+        QCommandLineOption(
+            QStringList() << "sshStrictHostKeyChecking",
+            QCoreApplication::translate("main", "Enable ssh strict host key checking")))
   , m_iniFileDirectoryOption(
         QCommandLineOption(
-            QStringList() << "ini-directory" << "ini-directory",
+            QStringList() << "ini-directory",
             QCoreApplication::translate("main", "Where to find an ini-file."),
             QCoreApplication::translate("main", "directory")))
   , m_iniFileNameOption(
         QCommandLineOption(
-            QStringList() << "ini-filename" << "ini-filename",
+            QStringList() << "ini-filename",
             QCoreApplication::translate("main", "Name of ini-file."),
             QCoreApplication::translate("main", "file")))
   , m_pluginDirectoryOption(
         QCommandLineOption(
-            QStringList() << "plugin-directory" << "plugin-directory",
+            QStringList() << "plugin-directory",
             QCoreApplication::translate("main", "Where to find dc-plugin."),
             QCoreApplication::translate("main", "directory")))
   , m_pluginNameOption(
         QCommandLineOption(
-            QStringList() << "plugin-name" << "plugin-name",
+            QStringList() << "plugin-name",
             QCoreApplication::translate("main", "Name of dc-plugin."),
             QCoreApplication::translate("main", "directory")))
   , m_noDownloadOption(
@@ -57,17 +68,17 @@ CommandLineParser::CommandLineParser()
             QCoreApplication::translate("main", "Always download the dc-bin-file to DC).")))
   , m_workingDirectoryOption(
         QCommandLineOption(
-            QStringList() << "working-directory" << "working-directory",
+            QStringList() << "working-directory",
             QCoreApplication::translate("main", "working directory of update-script."),
             QCoreApplication::translate("main", "directory")))
   , m_psaConfigDirectoryOption(
         QCommandLineOption(
-            QStringList() << "psa-config-directory" << "psa-config-directory",
+            QStringList() << "psa-config-directory",
             QCoreApplication::translate("main", "config directory of json-files sent to dc."),
             QCoreApplication::translate("main", "directory")))
   , m_psaTariffDirectoryOption(
         QCommandLineOption(
-            QStringList() << "psa-tariff-directory" << "psa-tariff-directory",
+            QStringList() << "psa-tariff-directory",
             QCoreApplication::translate("main", "tariff directory of tariff-json-files."),
             QCoreApplication::translate("main", "directory")))
   , m_dryRunOption(
@@ -94,8 +105,8 @@ CommandLineParser::CommandLineParser()
   , m_readDCVersionOption(
         QCommandLineOption(
             QStringList() << "D" << "read-dc-version",
-            QCoreApplication::translate("main", "Show version of device controller."),
-            QCoreApplication::translate("main", "Show version of device controller."))) {
+            QCoreApplication::translate("main", "Show version of device controller.")))
+{
     configure();
 }
 
@@ -104,9 +115,15 @@ void CommandLineParser::configure() {
     m_parser.addHelpOption();
     m_parser.addVersionOption();
 
-    m_repositoryUrlOption.setDefaultValue("https://git.mimbach49.de/GerhardHoffmann");
+    m_repositoryUrlOption.setDefaultValue("gitea@ptu-config.atb-comm.de:ATB/");
     m_parser.addOption(m_repositoryUrlOption);
 
+    m_sshKeyFileOption.setDefaultValue("/opt/app/tools/atbupdate/.keys/id_ed25519_ptuConfig");
+    m_parser.addOption(m_sshKeyFileOption);
+
+    m_sshOptionStrictHostKeyCheckingOption.setDefaultValue("");
+    m_parser.addOption(m_sshOptionStrictHostKeyCheckingOption);
+
     m_iniFileDirectoryOption.setDefaultValue(QCoreApplication::applicationDirPath());
     m_parser.addOption(m_iniFileDirectoryOption);
 
@@ -177,6 +194,12 @@ void CommandLineParser::readSettings() {
                 if (key.contains("repository-url")) {
                     m_repositoryUrl = v.toString();
                 } else
+                if (key.contains("sshKeyFile")) {
+                    m_sshKeyFile = v.toString();
+                } else
+                if (key.contains("sshOptionStrictHostKeyChecking")) {
+                    m_sshOptionStrictHostKeyChecking = (v.toBool() ? "true" : "false");
+                } else
                 if (key.contains("plugin-directory")) {
                     m_plugInDir = v.toString();
                 } else
@@ -237,6 +260,21 @@ QString CommandLineParser::repositoryUrl() {
     return m_repositoryUrl;
 }
 
+QString CommandLineParser::sshKeyFile() {
+    if (m_parser.isSet(m_sshKeyFileOption)) {
+        m_sshKeyFile = m_parser.value(m_sshKeyFileOption);
+    }
+    return m_sshKeyFile;
+}
+
+bool CommandLineParser::sshOptionStrictHostKeyChecking()
+{
+    if (m_parser.isSet(m_sshOptionStrictHostKeyCheckingOption)) {
+        m_sshOptionStrictHostKeyChecking = m_parser.value(m_sshOptionStrictHostKeyCheckingOption);
+    }
+    return m_sshOptionStrictHostKeyChecking == "false" ? false : true;
+}
+
 QString CommandLineParser::plugInDir() {
     if (m_parser.isSet(m_pluginDirectoryOption)) {
         m_plugInDir = m_parser.value(m_pluginDirectoryOption);

UpdatePTUDevCtrl/commandline_parser.h

@@ -8,6 +8,8 @@
 
 class CommandLineParser : public QCommandLineParser {
     QString m_repositoryUrl;
+    QString m_sshKeyFile;
+    QString m_sshOptionStrictHostKeyChecking;
     QString m_plugInDir;
     QString m_plugInName;
     QString m_workingDir;
@@ -25,6 +27,8 @@ class CommandLineParser : public QCommandLineParser {
     QString m_dcDir{"etc/dc/"};
 
     QCommandLineOption m_repositoryUrlOption;
+    QCommandLineOption m_sshKeyFileOption;
+    QCommandLineOption m_sshOptionStrictHostKeyCheckingOption;
     QCommandLineOption m_iniFileDirectoryOption;
     QCommandLineOption m_iniFileNameOption;
     QCommandLineOption m_pluginDirectoryOption;
@@ -57,6 +61,8 @@ public:
     QString const &iniFileName() const { return m_iniFileName; }
     void readSettings();
     QString repositoryUrl();
+    QString sshKeyFile();
+    bool sshOptionStrictHostKeyChecking();
     QString plugInDir();
     QString plugInName();
     QString workingDir();

UpdatePTUDevCtrl/git/git_client.cpp

@@ -400,6 +400,12 @@ std::optional<QString> GitClient::gitPull() {
         If remote host keys are changed, then
 
         export GIT_SSH_COMMAND="ssh -i /opt/app/tools/atbupdate/.keys/id_ed25519_ptuConfig"
+
+        ... or ignore host key checking:
+        export GIT_SSH_COMMAND="ssh -i /opt/app/tools/atbupdate/.keys/id_ed25519_ptuConfig -o StrictHostKeyChecking=no"
+
+        ... or use separate known_hosts file:
+        export GIT_SSH_COMMAND="ssh -i /mypath/.keys/id_ed25519 -o StrictHostKeyChecking=yes -o UserKnownHostsFile=/opt/app/tools/atbupdate/.keys/known_hosts"
         git pull
 
         leads to the following warning/error message:

UpdatePTUDevCtrl/main.cpp

@@ -72,22 +72,31 @@ int main(int argc, char *argv[]) {
 
     CommandLineParser parser;
     parser.process(a);
+
+    if (parser.isSet(parser.addHelpOption())) {
+       parser.showHelp(0);
+       return 0;
+    }
+
     parser.readSettings();
 
     QString repositoryUrl = parser.repositoryUrl();
+    QString sshKeyFile    = parser.sshKeyFile();
+    bool strictHostKeyChecking = parser.sshOptionStrictHostKeyChecking();
 
     if (repositoryUrl.endsWith('/')) {
         repositoryUrl.chop(1);
     }
 
-    QString gitSSHCommand("");
+    // default for gitSSHCommand
+    QString gitSSHCommand = "ssh -i " + sshKeyFile;
+
+    strictHostKeyChecking ? gitSSHCommand.append(" -o StrictHostKeyChecking=yes")
+                          : gitSSHCommand.append(" -o StrictHostKeyChecking=no");
 
-    if (repositoryUrl.contains("ptu-config.atb-comm.de")) {
     QByteArray const v = qgetenv("GIT_SSH_COMMAND");
     if (v.isEmpty()) {
-            QString sshKeyFile("/opt/app/tools/atbupdate/.keys/id_ed25519_ptuConfig");
         if (QFileInfo(sshKeyFile).exists()) {
-                gitSSHCommand = "ssh -i /opt/app/tools/atbupdate/.keys/id_ed25519_ptuConfig";
             if (!qputenv("GIT_SSH_COMMAND", QByteArray(gitSSHCommand.toStdString().c_str()))) {
                 qCritical() << "ERROR: GIT_SSH_COMMAND not put into env. Exiting...";
                 return -1;
@@ -100,11 +109,6 @@ int main(int argc, char *argv[]) {
         gitSSHCommand = QString(v.toStdString().c_str());
         qCritical() << "WARNING GIT_SSH_COMMAND already set in enviroment:"
                     << gitSSHCommand;
-            if (gitSSHCommand != "ssh -i /opt/app/tools/atbupdate/.keys/id_ed25519_ptuConfig") {
-                qCritical() << "ERROR" << gitSSHCommand << "wrong. Exiting...";
-                return -1;
-            }
-        }
     }
 
     QString plugInDir = parser.plugInDir();
@@ -161,7 +165,6 @@ int main(int argc, char *argv[]) {
         return 0;
     }
 
-
     QThread::currentThread()->setObjectName("main thread");
     qInfo() << "Main thread" << QThread::currentThreadId();
 

UpdatePTUDevCtrl/update.cpp

@@ -40,7 +40,6 @@ QPluginLoader Update::pluginLoader;
 
 hwinf *Update::loadDCPlugin(QDir const &plugInDir, QString const &fname) {
     hwinf *hw = nullptr;
-#if 0
     if (plugInDir.exists()) {
         QString pluginLibName(fname);
         pluginLibName = plugInDir.absoluteFilePath(pluginLibName);
@@ -75,7 +74,6 @@ hwinf *Update::loadDCPlugin(QDir const &plugInDir, QString const &fname) {
         qCritical() << "plugins directory" << plugInDir.absolutePath()
                     << "does not exist";
     }
-#endif
     return hw;
 }
 
@@ -119,7 +117,6 @@ Update::Update(Worker *worker,
     , m_dryRun(dryRun)
     , m_sys_areDCdataValid(false) {
 
-#if 0
     if (!m_hw) {
         qCritical() << "(" << __func__ << ":" << __LINE__ << ") m_hw == nullptr -> ca-slave plugin not loaded";
     } else {
@@ -137,7 +134,6 @@ Update::Update(Worker *worker,
         qCritical() << "(" << __func__ << ":" << __LINE__ << ") m_sys_areDCDataValid ..."
                     << m_sys_areDCdataValid;
     }
-#endif
 }
 
 Update::~Update() {
@@ -610,8 +606,6 @@ QString Update::getFileVersion(QString const& jsonFileName) {
 }
 
 bool Update::checkDownloadedJsonVersions(QStringList const& jsonFileNames) {
-// note: 2026-02-09: this method is not used!
-#if 0
 
     for (QStringList::size_type i=0; i < jsonFileNames.size(); ++i) {
 
@@ -685,14 +679,14 @@ bool Update::checkDownloadedJsonVersions(QStringList const& jsonFileNames) {
             qCritical() << "CANNOT FIND JSON-NR FOR" << fName;
         }
     }
-#endif
+
     return false;
 }
 
 QMap<QString, QString>
 Update::getInstalledJsonVersions(QStringList const& jsonFileNames) {
     QMap<QString, QString> map;
-#if 0
+
     if (!m_hw) {
         qCritical() << "(" << __func__ << ":" << __LINE__ << "):"
                     << "ERROR!!! m_hw == nullptr";
@@ -792,7 +786,6 @@ Update::getInstalledJsonVersions(QStringList const& jsonFileNames) {
         }
     }
 
-#endif
     return map;
 }
 

UpdatePTUDevCtrl/utils.cpp

@@ -178,6 +178,9 @@ QString Utils::zoneName(quint8 i) {
     //if (i < (sizeof(zName)/sizeof(char const *))) {
     //    return zName[i];
     //}
+
+    Q_UNUSED(i)
+
     return "---";
 }
 

UpdatePTUDevCtrl/worker.cpp

@@ -290,7 +290,7 @@ void Worker::privateUpdate() {
         return;
     }
 
-    //return;
+    return;
 
     QString func(__PRETTY_FUNCTION__);
 
@@ -541,10 +541,9 @@ void Worker::privateUpdate() {
     //                  UPDATE THE PSA USING THE CHANGED FILES
     //
     ////////////////////////////////////////////////////////////////////////////
-    // for 281/Szeged: skip uploading files to DeviceController
-    //if ((continueUpdate = downloadFilesToPSAHardware()) == false) {
-    //    return;
-    //}
+    if ((continueUpdate = downloadFilesToPSAHardware()) == false) {
+        return;
+    }
     lst = QStringList(QString("DONE"));
     ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE_SUCCESS));
 

common.pri

@@ -1 +0,0 @@
-INCLUDEPATH += $$PWD/common/include