Skip to content

Commit 820cf0b

Browse files
committed
Plugins::Telnet: modify security level
1 parent 42d590b commit 820cf0b

4 files changed

Lines changed: 52 additions & 53 deletions

File tree

Plugins/Telnet/OperateTelnet.cpp

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ COperateTelnet::COperateTelnet(CPlugin *parent)
1414
: COperateTerminal(parent)
1515
, m_Telnet(QTelnet::TCP)
1616
, m_bLogin(false)
17-
, m_SecurityLevel(CSecurityLevel::Level::Risky)
1817
{
1918
qDebug(log) << Q_FUNC_INFO;
2019
auto &net = m_Parameters.m_Net;
@@ -30,11 +29,6 @@ COperateTelnet::~COperateTelnet()
3029
qDebug(log) << Q_FUNC_INFO;
3130
}
3231

33-
CSecurityLevel::Level COperateTelnet::GetSecurityLevel() const
34-
{
35-
return m_SecurityLevel;
36-
}
37-
3832
QDialog *COperateTelnet::OnOpenDialogSettings(QWidget *parent)
3933
{
4034
return new CDlgSettingsTelnet(&m_Parameters, parent);
@@ -52,6 +46,8 @@ int COperateTelnet::Start()
5246

5347
slotUpdateParameter(this);
5448

49+
slotSetSecurityLevel(CSecurityLevel::Level::Risky);
50+
5551
bool check = false;
5652
check = connect(&m_Telnet, &QTelnet::stateChanged,
5753
this, [=](QAbstractSocket::SocketState socketState){
@@ -157,7 +153,7 @@ const QString COperateTelnet::Name()
157153
auto &net = m_Parameters.m_Net;
158154
if(!net.GetHost().isEmpty()) {
159155
if(m_Parameters.GetGlobalParameters()
160-
&& (GetParameter()->GetGlobalParameters()->GetNameStyles()
156+
&& (m_Parameters.GetGlobalParameters()->GetNameStyles()
161157
& CParameterPlugin::NameStyle::Protocol)
162158
&& !Protocol().isEmpty())
163159
szName = Protocol() + ":";
@@ -170,7 +166,8 @@ const QString COperateTelnet::Name()
170166

171167
QString szSecurityLevel;
172168
CSecurityLevel sl(GetSecurityLevel());
173-
if((GetParameter()->GetGlobalParameters()->GetNameStyles()
169+
if(m_Parameters.GetGlobalParameters()
170+
&& (m_Parameters.GetGlobalParameters()->GetNameStyles()
174171
& CParameterPlugin::NameStyle::SecurityLevel)
175172
&& GetSecurityLevel() != CSecurityLevel::Level::No
176173
&& !sl.GetUnicodeIcon().isEmpty())
@@ -246,8 +243,7 @@ void COperateTelnet::slotNewData(const char *buf, int len)
246243
m_Telnet.sendData(password.toStdString().c_str(), password.length());
247244
m_Telnet.sendData("\n", 1);
248245
m_bLogin = true;
249-
m_SecurityLevel = CSecurityLevel::Level::Authentication;
250-
slotSetSecurityLevel(m_SecurityLevel);
246+
slotSetSecurityLevel(CSecurityLevel::Level::Authentication);
251247
}
252248
qDebug(log) << "Password:" << password;
253249

Plugins/Telnet/OperateTelnet.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ class COperateTelnet : public COperateTerminal
1515

1616
public:
1717
[[nodiscard]] virtual CBackend *InstanceBackend() override;
18-
[[nodiscard]] virtual CSecurityLevel::Level GetSecurityLevel() const override;
1918
virtual int Start() override;
2019
virtual int Stop() override;
2120

@@ -30,9 +29,7 @@ private Q_SLOTS:
3029
CParameterTelnet m_Parameters;
3130
QTelnet m_Telnet;
3231
bool m_bLogin;
33-
CSecurityLevel::Level m_SecurityLevel;
34-
35-
// COperate interface
32+
3633
public:
3734
virtual const QString Id() override;
3835
virtual const QString Name() override;

Src/Operate.h

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,8 +382,13 @@ class PLUGIN_EXPORT COperate : public QObject
382382

383383
//!@{
384384
//! \~chinese \name 统计
385-
//! \~english \name Stats
385+
//! \~english \name Statistics
386386
public:
387+
/*!
388+
* \~chinese 得到统计信息。如果有,其派生类则需要重载此函数提供统计信息。
389+
* \~english Get statistics. If so, its derived class needs to overload this function to provide statistical information.
390+
* \return Statistics pointer
391+
*/
387392
[[nodiscard]] virtual CStats* GetStats();
388393
/*!
389394
* \brief Get Security Level

Src/Terminal/OperateTerminal.cpp

Lines changed: 39 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,30 @@ COperateTerminal::~COperateTerminal()
8989
}
9090
}
9191

92+
const QString COperateTerminal::Id()
93+
{
94+
QString szId = COperate::Id();
95+
if(GetParameter()) {
96+
if(GetParameter()->GetName().isEmpty())
97+
szId += "_" + Name();
98+
else
99+
szId += "_" + GetParameter()->GetName();
100+
}
101+
static QRegularExpression exp("[-@:/#%!^&* \\.]");
102+
szId = szId.replace(exp, "_");
103+
return szId;
104+
}
105+
106+
const QString COperateTerminal::Name()
107+
{
108+
QString szName;
109+
if(GetParameter())
110+
szName = GetParameter()->GetName();
111+
if(szName.isEmpty())
112+
szName = COperate::Name();
113+
return szName;
114+
}
115+
92116
const QString COperateTerminal::Description()
93117
{
94118
QString szDescription;
@@ -121,6 +145,21 @@ const QString COperateTerminal::Description()
121145
return szDescription;
122146
}
123147

148+
const qint16 COperateTerminal::Version() const
149+
{
150+
return 0;
151+
}
152+
153+
const QString COperateTerminal::Details()
154+
{
155+
QString szDetails;
156+
szDetails = " - " + tr("QTermWidget") + "\n" +
157+
" - " + tr("Version:") + " " + QString("%1.%2.%3").arg(QTERMWIDGET_VERSION_MAJOR)
158+
.arg(QTERMWIDGET_VERSION_MINOR)
159+
.arg(QTERMWIDGET_VERSION_PATCH) + "\n";
160+
return szDetails;
161+
}
162+
124163
QWidget* COperateTerminal::GetViewer()
125164
{
126165
return m_pTerminal;
@@ -337,21 +376,6 @@ void COperateTerminal::slotFocusOut()
337376
SetShotcuts(false);
338377
}
339378

340-
const qint16 COperateTerminal::Version() const
341-
{
342-
return 0;
343-
}
344-
345-
const QString COperateTerminal::Details()
346-
{
347-
QString szDetails;
348-
szDetails = " - " + tr("QTermWidget") + "\n" +
349-
" - " + tr("Version:") + " " + QString("%1.%2.%3").arg(QTERMWIDGET_VERSION_MAJOR)
350-
.arg(QTERMWIDGET_VERSION_MINOR)
351-
.arg(QTERMWIDGET_VERSION_PATCH) + "\n";
352-
return szDetails;
353-
}
354-
355379
int COperateTerminal::SetGlobalParameters(CParameterPlugin *pPara)
356380
{
357381
Q_ASSERT(pPara);
@@ -424,26 +448,3 @@ void COperateTerminal::SetShotcuts(bool bEnable)
424448
m_pClear->setShortcut(QKeySequence());
425449
}
426450

427-
const QString COperateTerminal::Id()
428-
{
429-
QString szId = COperate::Id();
430-
if(GetParameter()) {
431-
if(GetParameter()->GetName().isEmpty())
432-
szId += "_" + Name();
433-
else
434-
szId += "_" + GetParameter()->GetName();
435-
}
436-
static QRegularExpression exp("[-@:/#%!^&* \\.]");
437-
szId = szId.replace(exp, "_");
438-
return szId;
439-
}
440-
441-
const QString COperateTerminal::Name()
442-
{
443-
QString szName;
444-
if(GetParameter())
445-
szName = GetParameter()->GetName();
446-
if(szName.isEmpty())
447-
szName = COperate::Name();
448-
return szName;
449-
}

0 commit comments

Comments
 (0)