Plugins::FtpServer: add white and black list

Author: KangLin

Plugins/FtpServer/BackendFtpServer.cpp

@@ -75,7 +75,37 @@ int CBackendFtpServer::OnClean()
 
 bool CBackendFtpServer::onFilter(QSslSocket *socket)
 {
+    bool bFilte = false;
     if(!socket) return true;
+    QString szIP = socket->peerAddress().toString();
+    
+    QStringList white = m_Para->GetWhitelist();
+    QStringList black = m_Para->GetBlacklist();
+    bool bInWhite = false;
+    if(!white.isEmpty()) {
+        foreach(auto i, white) {
+            QHostAddress addr(szIP);
+            auto sub = QHostAddress::parseSubnet(i);
+            if(addr.isInSubnet(sub.first, sub.second)) {
+                bInWhite = true;
+                break;
+            }
+        }
+    }
+
+    if(!bInWhite && !black.isEmpty()) {
+        foreach(auto i, black) {
+            QHostAddress addr(szIP);
+            auto sub = QHostAddress::parseSubnet(i);
+            if(addr.isInSubnet(sub.first, sub.second)) {
+                qDebug(log) << "Filet" << szIP << "in blacklist";
+                return true;
+            }
+        }
+    }
+
+    if(bFilte) return true;
+
     if(m_Para->GetConnectCount() >= 0 && m_Para->GetConnectCount() <= m_Sockets.size()) {
         qDebug(log) << "Exceeded the allowed number of connections:" << m_Para->GetConnectCount();
         return true;
@@ -85,14 +115,14 @@ bool CBackendFtpServer::onFilter(QSslSocket *socket)
     check = connect(socket, SIGNAL(disconnected()),
                     this, SLOT(slotDisconnected()));
     Q_ASSERT(check);
-    QString ip = socket->peerAddress().toString();
+    
     quint16 port = socket->peerPort();
     m_Sockets.append(socket);
     m_nTotal++;
     emit sigConnectCount(m_nTotal, m_Sockets.size(), m_nDisconnect);
-    emit sigConnected(ip, port);
+    emit sigConnected(szIP, port);
     qDebug(log) << "Current connect count:" << m_Sockets.size()
-             << "; new connect from:" << ip + ":" + QString::number(port);
+             << "; new connect from:" << szIP + ":" + QString::number(port);
     return false;
 }
 

Plugins/FtpServer/DlgSettings.cpp

@@ -5,7 +5,8 @@
 #include <QLoggingCategory>
 #include <QStandardItem>
 #include <QNetworkInterface>
-
+#include <QMenu>
+#include <QInputDialog>
 #include "DlgSettings.h"
 #include "ui_DlgSettings.h"
 
@@ -15,6 +16,7 @@ CDlgSettings::CDlgSettings(QSharedPointer<CParameterFtpServer> para, QWidget *pa
     , ui(new Ui::CDlgSettings)
     , m_Para(para)
 {
+    bool check = false;
     ui->setupUi(this);
     Q_ASSERT(m_Para);
 
@@ -26,6 +28,7 @@ CDlgSettings::CDlgSettings(QSharedPointer<CParameterFtpServer> para, QWidget *pa
     ui->cbReadOnly->setChecked(m_Para->GetReadOnly());
     ui->sbConnectCount->setValue(m_Para->GetConnectCount());
     ui->sbConnectCount->setToolTip(tr("-1: Enable all\n 0: Disable all\n>0: Connect count"));
+
     ui->cbListenAll->setChecked(m_Para->GetListenAll());
     ui->lvListen->setModel(&m_ModelNetWorkInterface);
     foreach(auto iface, QNetworkInterface::allInterfaces()) {
@@ -53,6 +56,21 @@ CDlgSettings::CDlgSettings(QSharedPointer<CParameterFtpServer> para, QWidget *pa
             }
         }
     }
+
+    ui->lvBlacklist->setModel(&m_ModelBlack);
+    check = connect(ui->lvBlacklist, SIGNAL(customContextMenuRequested(const QPoint&)),
+                    this, SLOT(slotBlackListContextMenuRequested(const QPoint&)));
+    Q_ASSERT(check);
+    foreach (auto ip, m_Para->GetBlacklist()) {
+        m_ModelBlack.appendRow(new QStandardItem(ip));
+    }
+    ui->lvWhtelist->setModel(&m_ModelWhite);
+    check = connect(ui->lvWhtelist, SIGNAL(customContextMenuRequested(const QPoint&)),
+                    this, SLOT(slotWhiteListContextMenuRequested(const QPoint&)));
+    foreach (auto ip, m_Para->GetWhitelist()) {
+        m_ModelWhite.appendRow(new QStandardItem(ip));
+    }
+    Q_ASSERT(check);
 }
 
 CDlgSettings::~CDlgSettings()
@@ -77,6 +95,7 @@ void CDlgSettings::accept()
     m_Para->SetAnonymousLogin(ui->cbAnonmousLogin->isChecked());
     m_Para->SetReadOnly(ui->cbReadOnly->isChecked());
     m_Para->SetConnectCount(ui->sbConnectCount->value());
+
     m_Para->SetListenAll(ui->cbListenAll->isChecked());
     QStringList lstInterface;
     for (int row = 0; row < m_ModelNetWorkInterface.rowCount(); row++) {
@@ -86,6 +105,18 @@ void CDlgSettings::accept()
         }
     }
     m_Para->SetListen(lstInterface);
+
+    QStringList lstBlack;
+    for (int i = 0; i < m_ModelBlack.rowCount(); ++i) {
+       lstBlack << m_ModelBlack.item(i)->text();
+    }
+    m_Para->SetBlacklist(lstBlack);
+    QStringList lstWhite;
+    for (int i = 0; i < m_ModelWhite.rowCount(); ++i) {
+        lstWhite << m_ModelWhite.item(i)->text();
+    }
+    m_Para->SetWhitelist(lstWhite);
+
     QDialog::accept();
 }
 
@@ -101,3 +132,46 @@ void CDlgSettings::on_cbListenAll_checkStateChanged(const Qt::CheckState &arg1)
     ui->lvListen->setEnabled(Qt::Checked != arg1);
 }
 
+void CDlgSettings::slotWhiteListContextMenuRequested(const QPoint& pos)
+{
+    QMenu m;
+    QItemSelectionModel* pSelect = ui->lvWhtelist->selectionModel();
+    QModelIndexList lstIndex = pSelect->selectedRows();
+    m.addAction(tr("Add"), [this](){
+        QString szIp = QInputDialog::getText(this, tr("Add whilte list"), tr("Add ip address:"));
+        QStandardItem* item = new QStandardItem(szIp);
+        m_ModelWhite.appendRow(item);
+    });
+    if(!lstIndex.isEmpty()) {
+        m.addAction(tr("Remove"), [this, lstIndex]() {
+            foreach(auto idx, lstIndex) {
+                m_ModelWhite.removeRow(idx.row());
+            }
+        });
+    }
+
+    QPoint p = ui->lvWhtelist->mapToGlobal(pos);
+    m.exec(p);
+}
+
+void CDlgSettings::slotBlackListContextMenuRequested(const QPoint& pos)
+{
+    QMenu m;
+    QItemSelectionModel* pSelect = ui->lvBlacklist->selectionModel();
+    QModelIndexList lstIndex = pSelect->selectedRows();
+    m.addAction(tr("Add"), [this](){
+        QString szIp = QInputDialog::getText(this, tr("Add black list"), tr("Add ip address:"));
+        QStandardItem* item = new QStandardItem(szIp);
+        m_ModelBlack.appendRow(item);
+    });
+    if(!lstIndex.isEmpty()) {
+        m.addAction(tr("Remove"), [this, lstIndex]() {
+            foreach(auto idx, lstIndex) {
+                m_ModelBlack.removeRow(idx.row());
+            }
+        });
+    }
+
+    QPoint p = ui->lvBlacklist->mapToGlobal(pos);
+    m.exec(p);
+}

Plugins/FtpServer/DlgSettings.h

@@ -21,15 +21,16 @@ class CDlgSettings : public QDialog
 
 public slots:
     virtual void accept() override;
-private slots:
+private Q_SLOTS:
     void on_pbRoot_clicked();
-    
     void on_cbAnonmousLogin_checkStateChanged(const Qt::CheckState &arg1);
-    
     void on_cbListenAll_checkStateChanged(const Qt::CheckState &arg1);
-    
+    void slotWhiteListContextMenuRequested(const QPoint& pos);
+    void slotBlackListContextMenuRequested(const QPoint& pos);
 private:
     Ui::CDlgSettings *ui;
     QSharedPointer<CParameterFtpServer> m_Para;
     QStandardItemModel m_ModelNetWorkInterface;
+    QStandardItemModel m_ModelBlack;
+    QStandardItemModel m_ModelWhite;
 };