added remaining 1.38 items to provisioning editor

Author: andrew-bibb

apps/cmstapp/code/provisioning/prov_ed.cpp

@@ -81,7 +81,6 @@ ProvisioningEditor::ProvisioningEditor(QWidget* parent, const float& ver) : QDia
   group_freeform->addAction(ui.actionWifiPrivateKeyPassphrase);
   group_freeform->addAction(ui.actionWifiIdentity);
   group_freeform->addAction(ui.actionWifiAnonymousIdentity);
-  group_freeform->addAction(ui.actionWifiSubjectMatch);
   group_freeform->addAction(ui.actionWifiPassphrase); 
   group_freeform->addAction(ui.actionWifiPhase2);
   group_freeform->addAction(ui.actionServiceDeviceName);
@@ -105,6 +104,10 @@ ProvisioningEditor::ProvisioningEditor(QWidget* parent, const float& ver) : QDia
   group_validated->addAction(ui.actionServiceSearchDomains);
   group_validated->addAction(ui.actionServiceDomain);
   group_validated->addAction(ui.actionWifiName);
+  group_validated->addAction(ui.actionWifiSubjectMatch);
+  group_validated->addAction(ui.actionWifiAltSubjectMatch);
+  group_validated->addAction(ui.actionWifiDomainMatch);
+  group_validated->addAction(ui.actionWifiDomainSuffixMatch);
 
   group_selectfile = new QActionGroup(this);
   group_selectfile->addAction(ui.actionWifiCACertFile);
@@ -153,6 +156,9 @@ ProvisioningEditor::ProvisioningEditor(QWidget* parent, const float& ver) : QDia
   if (ver > 1.37f) {
   menu_wifi->addAction(ui.actionWifiAnonymousIdentity);
   menu_wifi->addAction(ui.actionWifiSubjectMatch);
+  menu_wifi->addAction(ui.actionWifiAltSubjectMatch);
+  menu_wifi->addAction(ui.actionWifiDomainMatch);
+  menu_wifi->addAction(ui.actionWifiDomainSuffixMatch);
   }
   menu_wifi->addSeparator();
   menu_wifi->addAction(ui.actionWifiCACertFile);
@@ -222,6 +228,7 @@ void ProvisioningEditor::inputValidated(QAction* act)
 {
   // variables
   QString key = act->text();
+  QChar delim(','); // default delim character for plurals
 
   // create the dialog
   shared::ValidatingDialog* vd = new shared::ValidatingDialog(this);
@@ -233,7 +240,11 @@ void ProvisioningEditor::inputValidated(QAction* act)
   if (act == ui.actionServiceTimeServers) {vd->setLabel(tr("List of Timeservers")); vd->setValidator(CMST::ValDialog_46d, true);}
   if (act == ui.actionServiceSearchDomains) {vd->setLabel(tr("List of DNS Search Domains")); vd->setValidator(CMST::ValDialog_Dom, true);}
   if (act == ui.actionServiceDomain) {vd->setLabel(tr("Domain name to be used")); vd->setValidator(CMST::ValDialog_Dom);}
-  if (act == ui.actionWifiName) {vd->setLabel(tr("Enter the string representation of an 802.11 SSID.")); vd->setValidator(CMST::ValDialog_Wd);}
+  if (act == ui.actionWifiName) {vd->setLabel(tr("Enter the string representation of an 802.11 SSID.")); vd->setValidator(CMST::ValDialog_Word);}
+  if (act == ui.actionWifiSubjectMatch) { vd->setLabel(tr("Substring to be matched against the subject of the authentication server")); vd->setValidator(CMST::ValDialog_Word);}
+  if (act == ui.actionWifiAltSubjectMatch) {vd->setLabel(tr("List of entries to be matched against the alternative subject name.")); vd->setValidator(CMST::ValDialog_Word, true); delim=';';}
+  if (act == ui.actionWifiDomainMatch) {vd->setLabel(tr("A fully qualified domain name used as a full match requirement for the authentication server")); vd->setValidator(CMST::ValDialog_Dom);}
+  if (act == ui.actionWifiDomainSuffixMatch) {vd->setLabel(tr("A fully qualified domain name used as a suffix match requirement for the authentication server")); vd->setValidator(CMST::ValDialog_Dom);}
 
   // if accepted put an entry in the textedit
   if (vd->exec() == QDialog::Accepted) {
@@ -245,7 +256,7 @@ void ProvisioningEditor::inputValidated(QAction* act)
       s.replace(',', ' ');
       s.replace(';', ' ');
       s = s.simplified();
-      s.replace(' ', ',');
+      s.replace(' ', delim);
     }
 
     ui.plainTextEdit_main->insertPlainText(key.arg(s) );
@@ -315,6 +326,7 @@ void ProvisioningEditor::inputFreeForm(QAction* act)
   if (act == ui.actionGlobalDescription)  str = tr("Enter a description of the network.");
   if (act == ui.actionWifiPrivateKeyPassphrase) str = tr("Password/Passphrase for the private key file.");
   if (act == ui.actionWifiIdentity) str = tr("Identity string for EAP.");
+  if (act == ui.actionWifiAnonymousIdentity) str = tr("Anonymous identity string for EAP.");
   if (act == ui.actionWifiPassphrase) str = tr("RSN/WPA/WPA2 Passphrase");
   if (act == ui.actionWifiPhase2) str = tr("Phase 2 (inner authentication with TLS tunnel)<br>authentication method.");   
   if (act == ui.actionServiceDeviceName) str = tr("The interface name in which to apply the provisioning (ex. eth0)") ; 

apps/cmstapp/code/provisioning/ui/provisioning_editor.ui

@@ -394,6 +394,30 @@
     <string>Substring to be matched against the subject of the authentication server certificate for EAP</string>
    </property>
   </action>
+  <action name="actionWifiAltSubjectMatch">
+   <property name="text">
+    <string>AltSubjectMatch</string>
+   </property>
+   <property name="toolTip">
+    <string>Semicolon separated string of entries to be matched against the alternative subject name of the authentication server certificate for EAP</string>
+   </property>
+  </action>
+  <action name="actionWifiDomainSuffixMatch">
+   <property name="text">
+    <string>DomainSuffixMatch</string>
+   </property>
+   <property name="toolTip">
+    <string>A FQDN used as a suffix match requirement for the authentication server.</string>
+   </property>
+  </action>
+  <action name="actionWifiDomainMatch">
+   <property name="text">
+    <string>DomainMatch</string>
+   </property>
+   <property name="toolTip">
+    <string>A FQDN used as a full match requirement for the authentication server.</string>
+   </property>
+  </action>
  </widget>
  <resources/>
  <connections>

apps/cmstapp/code/shared/shared.cpp

@@ -129,11 +129,12 @@ void shared::ValidatingDialog::setValidator(const int& vd, bool plural)
   const QString s_hex   = "[0-9a-fA-F]*";
   const QString s_int   = "[0-9]*";
   const QString s_dom   = "((?!-)[A-Za-z0-9-]{1,63}(?<!-)\\.)+[A-Za-z]{2,6}";
-  const QString s_wd    = "[0-9,a-zA-Z_\\.\\!\\@\\#\\$\\%\\^\\&\\*\\+\\-]*";
+  const QString s_word    = "[0-9,a-zA-Z_\\.\\!\\@\\#\\$\\%\\^\\&\\*\\+\\-]*";
   const QString s_ch    = "\\S";
   const QString s_start = (plural ? "\\s?|(" : "^");
   const QString s_end   = (plural ? "(\\s*|[,|;|\\s]\\s*|$))+" : "$");
 
+
   switch (vd){
     case CMST::ValDialog_IPv4: {
       QRegularExpression rx4(s_start + s_ip4 + "(?:\\." + s_ip4 + "){3}" + s_end);
@@ -183,8 +184,8 @@ void shared::ValidatingDialog::setValidator(const int& vd, bool plural)
       lineedit->setValidator(lev_dom);
       lev_dom->deleteLater(); }
       break;
-    case CMST::ValDialog_Wd: {
-      QRegularExpression rxwd(s_start + s_wd + s_end);
+    case CMST::ValDialog_Word: {
+      QRegularExpression rxwd(s_start + s_word + s_end);
       QRegularExpressionValidator* lev_wd = new QRegularExpressionValidator(rxwd, this);
       lineedit->setValidator(lev_wd);
       lev_wd->deleteLater(); }

apps/cmstapp/code/vpn_prov_ed/vpn_ed.cpp

@@ -565,7 +565,7 @@ void VPN_Editor::inputFreeForm(QAction* act, QString key)
 
   // create some prompts
   if (key == "Name") str = tr("User defined name for the VPN");
-  else if (key == "Domain") str = tr("Domain name for the VPN Service\n(example: corporate.com)");
+  else if (key == "Domain") str = tr("Domain name for the VPN Service\n(ex: corporate.com)");
   else if (key == "Networks") str = tr("Networks behind the VPN link, if more than one separate by a comma.\n"
                                         "Format is network/netmask/gateway, and gateway can be omitted.\n"
                                         "Ex: 10.10.20.0/255.255.255.0/10.20.1.5,192.168.99.1/24,2001:Ldb8::1/16\n\n"

apps/resource.h

@@ -35,7 +35,7 @@ DEALINGS IN THE SOFTWARE.
 ///////////////////////////////// Program Values ///////////////////////
 //
 // Program Info (may be visible, but don't mark for tranalation) 
-#define VERSION "2020.03.02-1"
+#define VERSION "2020.03.03-1"
 
 #define RELEASE_DATE "1 January 2020"
 #define COPYRIGHT_DATE "2013-2020"
@@ -91,7 +91,7 @@ namespace CMST
     ValDialog_Hex     = 0x06,
     ValDialog_Int     = 0x07,
     ValDialog_Dom     = 0x08,
-    ValDialog_Wd      = 0x09,
+    ValDialog_Word    = 0x09,
     ValDialog_min1ch  = 0x0a,
     ValDialog_min8ch  = 0x0b,
     ValDialog_46d     = 0x0c,

text/changelog.txt

@@ -17,7 +17,8 @@
 <li>Added mDNS setting to the provisioning editor.</li>
 <li>Added DeviceName field to the provisioning editor.<li>
 <li>Added AnonymousIdentity field to the wifi secion of the provisioning editor.<li>
-<li>Added SubjectMatch field to the wifi section of the provisioning editor. <li>
+<li>Added SubjectMatch and AltSubjectMatch fields to the wifi section of the provisioning editor. <li>
+<li>Added DomainMatch and DomainSuffixMatch fields to the wifi section of the provisioning editor. </li>
 </ul>
 </ul>
 <b> 2019.01.13</b>