Integrating latest 47acbe8

Code/Tools/AssetProcessor/native/ui/MainWindow.cpp

@@ -187,31 +187,31 @@ void MainWindow::Activate()
     ui->connectionTreeView->setContextMenuPolicy(Qt::CustomContextMenu);
     connect(ui->connectionTreeView, &QTreeView::customContextMenuRequested, this, &MainWindow::OnConnectionContextMenu);
 
-    //white list connections
+    //allowed list connections
     connect(m_guiApplicationManager->GetConnectionManager(), &ConnectionManager::FirstTimeAddedToRejctedList, this, &MainWindow::FirstTimeAddedToRejctedList);
-    connect(m_guiApplicationManager->GetConnectionManager(), &ConnectionManager::SyncWhiteListAndRejectedList, this, &MainWindow::SyncWhiteListAndRejectedList);
-    connect(ui->whiteListWhiteListedConnectionsListView, &QListView::clicked, this, &MainWindow::OnWhiteListedConnectionsListViewClicked);
-    ui->whiteListWhiteListedConnectionsListView->setModel(&m_whitelistedAddresses);
-    connect(ui->whiteListRejectedConnectionsListView, &QListView::clicked, this, &MainWindow::OnRejectedConnectionsListViewClicked);
-    ui->whiteListRejectedConnectionsListView->setModel(&m_rejectedAddresses);
+    connect(m_guiApplicationManager->GetConnectionManager(), &ConnectionManager::SyncAllowedListAndRejectedList, this, &MainWindow::SyncAllowedListAndRejectedList);
+    connect(ui->allowListAllowedListConnectionsListView, &QListView::clicked, this, &MainWindow::OnAllowedListConnectionsListViewClicked);
+    ui->allowListAllowedListConnectionsListView->setModel(&m_allowedListAddresses);
+    connect(ui->allowedListRejectedConnectionsListView, &QListView::clicked, this, &MainWindow::OnRejectedConnectionsListViewClicked);
+    ui->allowedListRejectedConnectionsListView->setModel(&m_rejectedAddresses);
     
-    connect(ui->whiteListEnableCheckBox, &QCheckBox::toggled, this, &MainWindow::OnWhiteListCheckBoxToggled);
+    connect(ui->allowedListEnableCheckBox, &QCheckBox::toggled, this, &MainWindow::OnAllowedListCheckBoxToggled);
     
-    connect(ui->whiteListAddHostNameToolButton, &QToolButton::clicked, this, &MainWindow::OnAddHostNameWhiteListButtonClicked);
-    connect(ui->whiteListAddIPToolButton, &QPushButton::clicked, this, &MainWindow::OnAddIPWhiteListButtonClicked);
+    connect(ui->allowedListAddHostNameToolButton, &QToolButton::clicked, this, &MainWindow::OnAddHostNameAllowedListButtonClicked);
+    connect(ui->allowedListAddIPToolButton, &QPushButton::clicked, this, &MainWindow::OnAddIPAllowedListButtonClicked);
     
-    connect(ui->whiteListToWhiteListToolButton, &QPushButton::clicked, this, &MainWindow::OnToWhiteListButtonClicked);
-    connect(ui->whiteListToRejectedListToolButton, &QToolButton::clicked, this, &MainWindow::OnToRejectedListButtonClicked);
+    connect(ui->allowedListToAllowedListToolButton, &QPushButton::clicked, this, &MainWindow::OnToAllowedListButtonClicked);
+    connect(ui->allowedListToRejectedListToolButton, &QToolButton::clicked, this, &MainWindow::OnToRejectedListButtonClicked);
 
     //set the input validator for ip addresses on the add address line edit
     QRegExp validHostName("^((?=.{1,255}$)[0-9A-Za-z](?:(?:[0-9A-Za-z]|\\b-){0,61}[0-9A-Za-z])?(?:\\.[0-9A-Za-z](?:(?:[0-9A-Za-z]|\\b-){0,61}[0-9A-Za-z])?)*\\.?)$");
     QRegExp validIP("^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\\/([0-9]|[1-2][0-9]|3[0-2]))?$|^((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:)))(%.+)?s*(\\/([0-9]|[1-9][0-9]|1[0-1][0-9]|12[0-8]))?$");
 
     QRegExpValidator* hostNameValidator = new QRegExpValidator(validHostName, this);
-    ui->whiteListAddHostNameLineEdit->setValidator(hostNameValidator);
+    ui->allowedListAddHostNameLineEdit->setValidator(hostNameValidator);
     
     QRegExpValidator* ipValidator = new QRegExpValidator(validIP, this);
-    ui->whiteListAddIPLineEdit->setValidator(ipValidator);
+    ui->allowedListAddIPLineEdit->setValidator(ipValidator);
 
     //Job view
     m_jobSortFilterProxy->setSourceModel(m_jobsModel);
@@ -555,65 +555,65 @@ void MainWindow::OnAddConnection(bool /*checked*/)
     m_guiApplicationManager->GetConnectionManager()->addUserConnection();
 }
 
-void MainWindow::OnWhiteListedConnectionsListViewClicked() 
+void MainWindow::OnAllowedListConnectionsListViewClicked() 
 {
-    ui->whiteListRejectedConnectionsListView->clearSelection();
+    ui->allowedListRejectedConnectionsListView->clearSelection();
 }
 
 void MainWindow::OnRejectedConnectionsListViewClicked()
 {
-    ui->whiteListWhiteListedConnectionsListView->clearSelection();
+    ui->allowListAllowedListConnectionsListView->clearSelection();
 }
 
-void MainWindow::OnWhiteListCheckBoxToggled() 
+void MainWindow::OnAllowedListCheckBoxToggled() 
 {
-    if (!ui->whiteListEnableCheckBox->isChecked())
+    if (!ui->allowedListEnableCheckBox->isChecked())
     {
         //warn this is not safe
-        if(QMessageBox::Ok == QMessageBox::warning(this, tr("!!!WARNING!!!"), tr("Turning off white listing poses a significant security risk as it would allow any device to connect to your asset processor and that device will have READ/WRITE access to the Asset Processors file system. Only do this if you sure you know what you are doing and accept the risks."),
+        if(QMessageBox::Ok == QMessageBox::warning(this, tr("!!!WARNING!!!"), tr("Turning off allowed listing poses a significant security risk as it would allow any device to connect to your asset processor and that device will have READ/WRITE access to the Asset Processors file system. Only do this if you sure you know what you are doing and accept the risks."),
             QMessageBox::Ok | QMessageBox::Cancel, QMessageBox::Cancel))
         {
-            ui->whiteListRejectedConnectionsListView->clearSelection();
-            ui->whiteListWhiteListedConnectionsListView->clearSelection();
-            ui->whiteListAddHostNameLineEdit->setEnabled(false);
-            ui->whiteListAddHostNameToolButton->setEnabled(false);
-            ui->whiteListAddIPLineEdit->setEnabled(false);
-            ui->whiteListAddIPToolButton->setEnabled(false);
-            ui->whiteListWhiteListedConnectionsListView->setEnabled(false);
-            ui->whiteListRejectedConnectionsListView->setEnabled(false);
-            ui->whiteListToWhiteListToolButton->setEnabled(false);
-            ui->whiteListToRejectedListToolButton->setEnabled(false);
+            ui->allowedListRejectedConnectionsListView->clearSelection();
+            ui->allowListAllowedListConnectionsListView->clearSelection();
+            ui->allowedListAddHostNameLineEdit->setEnabled(false);
+            ui->allowedListAddHostNameToolButton->setEnabled(false);
+            ui->allowedListAddIPLineEdit->setEnabled(false);
+            ui->allowedListAddIPToolButton->setEnabled(false);
+            ui->allowListAllowedListConnectionsListView->setEnabled(false);
+            ui->allowedListRejectedConnectionsListView->setEnabled(false);
+            ui->allowedListToAllowedListToolButton->setEnabled(false);
+            ui->allowedListToRejectedListToolButton->setEnabled(false);
         }
         else
         {
-            ui->whiteListEnableCheckBox->setChecked(true);
+            ui->allowedListEnableCheckBox->setChecked(true);
         }
     }
     else
     {
-        ui->whiteListAddHostNameLineEdit->setEnabled(true);
-        ui->whiteListAddHostNameToolButton->setEnabled(true);
-        ui->whiteListAddIPLineEdit->setEnabled(true);
-        ui->whiteListAddIPToolButton->setEnabled(true);
-        ui->whiteListWhiteListedConnectionsListView->setEnabled(true);
-        ui->whiteListRejectedConnectionsListView->setEnabled(true);
-        ui->whiteListToWhiteListToolButton->setEnabled(true);
-        ui->whiteListToRejectedListToolButton->setEnabled(true);
+        ui->allowedListAddHostNameLineEdit->setEnabled(true);
+        ui->allowedListAddHostNameToolButton->setEnabled(true);
+        ui->allowedListAddIPLineEdit->setEnabled(true);
+        ui->allowedListAddIPToolButton->setEnabled(true);
+        ui->allowListAllowedListConnectionsListView->setEnabled(true);
+        ui->allowedListRejectedConnectionsListView->setEnabled(true);
+        ui->allowedListToAllowedListToolButton->setEnabled(true);
+        ui->allowedListToRejectedListToolButton->setEnabled(true);
     }
     
-    m_guiApplicationManager->GetConnectionManager()->WhiteListingEnabled(ui->whiteListEnableCheckBox->isChecked());
+    m_guiApplicationManager->GetConnectionManager()->AllowedListingEnabled(ui->allowedListEnableCheckBox->isChecked());
 }
 
-void MainWindow::OnAddHostNameWhiteListButtonClicked()
+void MainWindow::OnAddHostNameAllowedListButtonClicked()
 {
-    QString text = ui->whiteListAddHostNameLineEdit->text();
-    const QRegExpValidator *hostnameValidator = static_cast<const QRegExpValidator *>(ui->whiteListAddHostNameLineEdit->validator());
+    QString text = ui->allowedListAddHostNameLineEdit->text();
+    const QRegExpValidator *hostnameValidator = static_cast<const QRegExpValidator *>(ui->allowedListAddHostNameLineEdit->validator());
     int pos;
     QValidator::State state = hostnameValidator->validate(text, pos);
     if (state == QValidator::Acceptable)
     {
-        auto lineEdit = ui->whiteListAddHostNameLineEdit;
-        m_guiApplicationManager->GetConnectionManager()->AddWhiteListedAddress(text);
+        auto lineEdit = ui->allowedListAddHostNameLineEdit;
+        m_guiApplicationManager->GetConnectionManager()->AddAddressToAllowedList(text);
         lineEdit->clear();
         // Clear error state set in LineEdit.
         lineEdit->setProperty(AzQtComponents::HasError, false);
@@ -625,16 +625,16 @@ void MainWindow::OnAddHostNameWhiteListButtonClicked()
     }
 }
 
-void MainWindow::OnAddIPWhiteListButtonClicked()
+void MainWindow::OnAddIPAllowedListButtonClicked()
 {
-    QString text = ui->whiteListAddIPLineEdit->text();
-    const QRegExpValidator *ipValidator = static_cast<const QRegExpValidator *>(ui->whiteListAddIPLineEdit->validator());
+    QString text = ui->allowedListAddIPLineEdit->text();
+    const QRegExpValidator *ipValidator = static_cast<const QRegExpValidator *>(ui->allowedListAddIPLineEdit->validator());
     int pos;
     QValidator::State state = ipValidator->validate(text, pos);
     if (state== QValidator::Acceptable)
     {
-        auto lineEdit = ui->whiteListAddIPLineEdit;
-        m_guiApplicationManager->GetConnectionManager()->AddWhiteListedAddress(text);
+        auto lineEdit = ui->allowedListAddIPLineEdit;
+        m_guiApplicationManager->GetConnectionManager()->AddAddressToAllowedList(text);
         lineEdit->clear();
         // Clear error state set in LineEdit.
         lineEdit->setProperty(AzQtComponents::HasError, false);
@@ -648,23 +648,23 @@ void MainWindow::OnAddIPWhiteListButtonClicked()
 
 void MainWindow::OnToRejectedListButtonClicked()
 {
-    QModelIndexList indices = ui->whiteListWhiteListedConnectionsListView->selectionModel()->selectedIndexes();
+    QModelIndexList indices = ui->allowListAllowedListConnectionsListView->selectionModel()->selectedIndexes();
     if(!indices.isEmpty() && indices.first().isValid())
     {
         QString itemText = indices.first().data(Qt::DisplayRole).toString();
-        m_guiApplicationManager->GetConnectionManager()->RemoveWhiteListedAddress(itemText);
+        m_guiApplicationManager->GetConnectionManager()->RemoveAddressFromAllowedList(itemText);
         m_guiApplicationManager->GetConnectionManager()->AddRejectedAddress(itemText, true);
     }
 }
 
-void MainWindow::OnToWhiteListButtonClicked()
+void MainWindow::OnToAllowedListButtonClicked()
 {
-    QModelIndexList indices = ui->whiteListRejectedConnectionsListView->selectionModel()->selectedIndexes();
+    QModelIndexList indices = ui->allowedListRejectedConnectionsListView->selectionModel()->selectedIndexes();
     if (!indices.isEmpty() && indices.first().isValid())
     {
         QString itemText = indices.front().data(Qt::DisplayRole).toString();
         m_guiApplicationManager->GetConnectionManager()->RemoveRejectedAddress(itemText);
-        m_guiApplicationManager->GetConnectionManager()->AddWhiteListedAddress(itemText);
+        m_guiApplicationManager->GetConnectionManager()->AddAddressToAllowedList(itemText);
     }
 }
 
@@ -715,9 +715,9 @@ void MainWindow::ShowWindow()
 }
 
 
-void MainWindow::SyncWhiteListAndRejectedList(QStringList whiteList, QStringList rejectedList)
+void MainWindow::SyncAllowedListAndRejectedList(QStringList allowedList, QStringList rejectedList)
 {
-    m_whitelistedAddresses.setStringList(whiteList);
+    m_allowedListAddresses.setStringList(allowedList);
     m_rejectedAddresses.setStringList(rejectedList);
 }
 
@@ -725,7 +725,7 @@ void MainWindow::FirstTimeAddedToRejctedList(QString ipAddress)
 {
     QMessageBox* msgBox = new QMessageBox(this);
     msgBox->setText(tr("!!!Rejected Connection!!!"));
-    msgBox->setInformativeText(ipAddress + tr(" tried to connect and was rejected because it was not on the white list. If you want this connection to be allowed go to connections tab and add it to white list."));
+    msgBox->setInformativeText(ipAddress + tr(" tried to connect and was rejected because it was not on the allowed list. If you want this connection to be allowed go to connections tab and add it to allowed list."));
     msgBox->setStandardButtons(QMessageBox::Ok);
     msgBox->setDefaultButton(QMessageBox::Ok);
     msgBox->setWindowModality(Qt::NonModal);

Code/Tools/AssetProcessor/native/ui/MainWindow.h

@@ -107,7 +107,7 @@ public:
 public Q_SLOTS:
     void ShowWindow();
     
-    void SyncWhiteListAndRejectedList(QStringList whiteList, QStringList rejectedList);
+    void SyncAllowedListAndRejectedList(QStringList allowedList, QStringList rejectedList);
     void FirstTimeAddedToRejctedList(QString ipAddress);
     void SaveLogPanelState();
     void OnAssetProcessorStatusChanged(const AssetProcessor::AssetProcessorStatusEntry entry);
@@ -163,17 +163,17 @@ private:
     void OnConnectionSelectionChanged(const QItemSelection& selected, const QItemSelection& deselected);
 
     QStringListModel m_rejectedAddresses;
-    QStringListModel m_whitelistedAddresses;
+    QStringListModel m_allowedListAddresses;
     
-    void OnWhiteListedConnectionsListViewClicked();
+    void OnAllowedListConnectionsListViewClicked();
     void OnRejectedConnectionsListViewClicked();
     
-    void OnWhiteListCheckBoxToggled();
+    void OnAllowedListCheckBoxToggled();
     
-    void OnAddHostNameWhiteListButtonClicked();
-    void OnAddIPWhiteListButtonClicked();
+    void OnAddHostNameAllowedListButtonClicked();
+    void OnAddIPAllowedListButtonClicked();
 
-    void OnToWhiteListButtonClicked();
+    void OnToAllowedListButtonClicked();
     void OnToRejectedListButtonClicked();
 
     void UpdateJobLogView(QModelIndex selectedIndex);

Code/Tools/AssetProcessor/native/ui/MainWindow.ui

@@ -917,11 +917,11 @@
            <widget class="AzQtComponents::TableView" name="connectionTreeView"/>
           </item>
           <item>
-           <widget class="QFrame" name="whiteListOuterFrame">
+           <widget class="QFrame" name="allowedListOuterFrame">
             <property name="frameShape">
              <enum>QFrame::StyledPanel</enum>
             </property>
-            <layout class="QVBoxLayout" name="whiteListVerticalLayout">
+            <layout class="QVBoxLayout" name="allowedListVerticalLayout">
              <property name="spacing">
               <number>0</number>
              </property>
@@ -938,8 +938,8 @@
               <number>0</number>
              </property>
              <item>
-              <widget class="QWidget" name="whiteListTopBarWidget" native="true">
-               <layout class="QHBoxLayout" name="whiteListHorizontalBar">
+              <widget class="QWidget" name="allowedListTopBarWidget" native="true">
+               <layout class="QHBoxLayout" name="allowedListHorizontalBar">
                 <property name="spacing">
                  <number>6</number>
                 </property>
@@ -956,12 +956,12 @@
                  <number>4</number>
                 </property>
                 <item>
-                 <widget class="QCheckBox" name="whiteListEnableCheckBox">
+                 <widget class="QCheckBox" name="allowedListEnableCheckBox">
                   <property name="toolTip">
-                   <string>Enable or Disable white listing. White listing is a security feature which limits what can connect to the asset processor.</string>
+                   <string>Enable or Disable allowed listing. Allowed listing is a security feature which limits what can connect to the asset processor.</string>
                   </property>
                   <property name="text">
-                   <string>Enable white listing</string>
+                   <string>Enable allowed listing</string>
                   </property>
                   <property name="checked">
                    <bool>true</bool>
@@ -969,7 +969,7 @@
                  </widget>
                 </item>
                 <item>
-                 <spacer name="whiteListBarSpacer">
+                 <spacer name="allowedListBarSpacer">
                   <property name="orientation">
                    <enum>Qt::Horizontal</enum>
                   </property>
@@ -982,7 +982,7 @@
                  </spacer>
                 </item>
                 <item>
-                 <widget class="Line" name="whiteListSeparatorLine">
+                 <widget class="Line" name="allowedListSeparatorLine">
                   <property name="orientation">
                    <enum>Qt::Horizontal</enum>
                   </property>
@@ -992,8 +992,8 @@
               </widget>
              </item>
              <item>
-              <widget class="QWidget" name="whiteListBottomBarWidget" native="true">
-               <layout class="QHBoxLayout" name="whiteListHorizontalBar2">
+              <widget class="QWidget" name="allowedListBottomBarWidget" native="true">
+               <layout class="QHBoxLayout" name="allowedListHorizontalBar2">
                 <property name="leftMargin">
                  <number>4</number>
                 </property>
@@ -1007,9 +1007,9 @@
                  <number>4</number>
                 </property>
                 <item>
-                 <widget class="QLabel" name="whiteListAddHostNameLabel">
+                 <widget class="QLabel" name="allowedListAddHostNameLabel">
                   <property name="toolTip">
-                   <string>White list a hostname. EX. MyComputer321</string>
+                   <string>Allowed list a hostname. EX. MyComputer321</string>
                   </property>
                   <property name="text">
                    <string>Add Host Name</string>
@@ -1017,12 +1017,12 @@
                  </widget>
                 </item>
                 <item>
-                 <widget class="QLineEdit" name="whiteListAddHostNameLineEdit"/>
+                 <widget class="QLineEdit" name="allowedListAddHostNameLineEdit"/>
                 </item>
                 <item>
-                 <widget class="QToolButton" name="whiteListAddHostNameToolButton">
+                 <widget class="QToolButton" name="allowedListAddHostNameToolButton">
                   <property name="toolTip">
-                   <string>Add the hostname to the white list.</string>
+                   <string>Add the hostname to the allowed list.</string>
                   </property>
                   <property name="text">
                    <string/>
@@ -1037,7 +1037,7 @@
                  </widget>
                 </item>
                 <item>
-                 <spacer name="whiteListHorizontalBar2Spacer">
+                 <spacer name="allowedListHorizontalBar2Spacer">
                   <property name="orientation">
                    <enum>Qt::Horizontal</enum>
                   </property>
@@ -1050,9 +1050,9 @@
                  </spacer>
                 </item>
                 <item>
-                 <widget class="QLabel" name="whiteListAddIPLabel">
+                 <widget class="QLabel" name="allowedListAddIPLabel">
                   <property name="toolTip">
-                   <string>White list an ipv4 or ipv6 address with or without a CIDR range. EX.  192.168.0.20 or 192.168.0.0/24 or 2001:db8:85a3:8d3:1319:8a2e:370:7348  or  2001:db8:85a3:8d3:1319:8a2e:370:7348/32</string>
+                   <string>Allowed list an ipv4 or ipv6 address with or without a CIDR range. EX.  192.168.0.20 or 192.168.0.0/24 or 2001:db8:85a3:8d3:1319:8a2e:370:7348  or  2001:db8:85a3:8d3:1319:8a2e:370:7348/32</string>
                   </property>
                   <property name="text">
                    <string>Add IP Address</string>
@@ -1060,12 +1060,12 @@
                  </widget>
                 </item>
                 <item>
-                 <widget class="QLineEdit" name="whiteListAddIPLineEdit"/>
+                 <widget class="QLineEdit" name="allowedListAddIPLineEdit"/>
                 </item>
                 <item>
-                 <widget class="QToolButton" name="whiteListAddIPToolButton">
+                 <widget class="QToolButton" name="allowedListAddIPToolButton">
                   <property name="toolTip">
-                   <string>Add the ip address to the white list.</string>
+                   <string>Add the ip address to the allowed list.</string>
                   </property>
                   <property name="text">
                    <string/>
@@ -1083,9 +1083,9 @@
               </widget>
              </item>
              <item>
-              <layout class="QHBoxLayout" name="whiteListHorizontalBar3">
+              <layout class="QHBoxLayout" name="allowedListHorizontalBar3">
                <item>
-                <widget class="Line" name="whiteListLine">
+                <widget class="Line" name="allowedListLine">
                  <property name="orientation">
                   <enum>Qt::Horizontal</enum>
                  </property>
@@ -1094,22 +1094,22 @@
               </layout>
              </item>
              <item>
-              <layout class="QHBoxLayout" name="whiteListHorizontalLabelsLayout">
+              <layout class="QHBoxLayout" name="allowedListHorizontalLabelsLayout">
                <property name="leftMargin">
                 <number>4</number>
                </property>
                <item>
-                <widget class="QLabel" name="whiteListWhiteListedConnnectionListLabel">
+                <widget class="QLabel" name="allowedListAllowedListedConnnectionListLabel">
                  <property name="toolTip">
-                  <string>White listed connection are addresses, ranges and name that will be allowed to connect to the asset processor.</string>
+                  <string>Allowed listed connection are addresses, ranges and name that will be allowed to connect to the asset processor.</string>
                  </property>
                  <property name="text">
-                  <string>White Listed Connections</string>
+                  <string>Allowed Listed Connections</string>
                  </property>
                 </widget>
                </item>
                <item>
-                <spacer name="whiteListHorizontalLabelSpacer1">
+                <spacer name="allowedListHorizontalLabelSpacer1">
                  <property name="orientation">
                   <enum>Qt::Horizontal</enum>
                  </property>
@@ -1122,7 +1122,7 @@
                 </spacer>
                </item>
                <item>
-                <widget class="QLabel" name="whiteListRejectedConnectionListLabel">
+                <widget class="QLabel" name="allowedListRejectedConnectionListLabel">
                  <property name="toolTip">
                   <string>Rejected connections are addresses that failed to connect to the asset processor.</string>
                  </property>
@@ -1132,7 +1132,7 @@
                 </widget>
                </item>
                <item>
-                <spacer name="whiteListHorizontalLabelSpacer2">
+                <spacer name="allowedListHorizontalLabelSpacer2">
                  <property name="orientation">
                   <enum>Qt::Horizontal</enum>
                  </property>
@@ -1147,7 +1147,7 @@
               </layout>
              </item>
              <item>
-              <layout class="QHBoxLayout" name="whiteListHorizontalViewsLayout">
+              <layout class="QHBoxLayout" name="allowedListHorizontalViewsLayout">
                <property name="spacing">
                 <number>9</number>
                </property>
@@ -1164,16 +1164,16 @@
                 <number>4</number>
                </property>
                <item>
-                <widget class="QListView" name="whiteListWhiteListedConnectionsListView">
+                <widget class="QListView" name="allowListAllowedListConnectionsListView">
                  <property name="showDropIndicator" stdset="0">
                   <bool>false</bool>
                  </property>
                 </widget>
                </item>
                <item>
-                <layout class="QVBoxLayout" name="whiteListButtonVerticalLayout">
+                <layout class="QVBoxLayout" name="allowedListButtonVerticalLayout">
                  <item>
-                  <spacer name="whiteListVerticalSpacer1">
+                  <spacer name="allowedListVerticalSpacer1">
                    <property name="orientation">
                     <enum>Qt::Vertical</enum>
                    </property>
@@ -1186,9 +1186,9 @@
                   </spacer>
                  </item>
                  <item>
-                  <widget class="QToolButton" name="whiteListToWhiteListToolButton">
+                  <widget class="QToolButton" name="allowedListToAllowedListToolButton">
                    <property name="toolTip">
-                    <string>Move a entry from rejected to the white list.</string>
+                    <string>Move a entry from rejected to the allowed list.</string>
                    </property>
                    <property name="text">
                     <string/>
@@ -1203,7 +1203,7 @@
                   </widget>
                  </item>
                  <item>
-                  <widget class="QToolButton" name="whiteListToRejectedListToolButton">
+                  <widget class="QToolButton" name="allowedListToRejectedListToolButton">
                    <property name="toolTip">
                     <string>Remove an entry from the whtie list.</string>
                    </property>
@@ -1220,7 +1220,7 @@
                   </widget>
                  </item>
                  <item>
-                  <spacer name="whiteListVerticalSpacer2">
+                  <spacer name="allowedListVerticalSpacer2">
                    <property name="orientation">
                     <enum>Qt::Vertical</enum>
                    </property>
@@ -1235,7 +1235,7 @@
                 </layout>
                </item>
                <item>
-                <widget class="QListView" name="whiteListRejectedConnectionsListView">
+                <widget class="QListView" name="allowedListRejectedConnectionsListView">
                  <property name="showDropIndicator" stdset="0">
                   <bool>false</bool>
                  </property>