Skip to content
Snippets Groups Projects
Commit 4575d629 authored by Emmanuel Lepage Vallee's avatar Emmanuel Lepage Vallee
Browse files

securityeval: Rename Validation to Evaluation 

It doesn't validate anything anymore

Refs #69834
parent 8048964e
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 180 additions and 180 deletions
CMakeLists.txt
+ 2
− 2
View file @ 4575d629
......@@ -204,7 +204,7 @@ SET( libringclient_LIB_SRCS
src/profilemodel.cpp
src/ringtonemodel.cpp
src/lastusednumbermodel.cpp
src/securityvalidationmodel.cpp
src/securityevaluationmodel.cpp
src/personmodel.cpp
src/collectionmodel.cpp
src/collectionmanagerinterface.cpp
......@@ -300,7 +300,7 @@ SET( libringclient_LIB_HDRS
src/numbercategory.h
src/ringtonemodel.h
src/lastusednumbermodel.h
src/securityvalidationmodel.h
src/securityevaluationmodel.h
src/certificate.h
src/personmodel.h
src/transitionalpersonbackend.h
......
src/account.cpp
+ 9
− 9
View file @ 4575d629
......@@ -49,8 +49,8 @@
#include "phonedirectorymodel.h"
#include "presencestatusmodel.h"
#include "uri.h"
#include "securityvalidationmodel.h"
#include "private/securityvalidationmodel_p.h"
#include "securityevaluationmodel.h"
#include "private/securityevaluationmodel_p.h"
#define TO_BOOL ?"true":"false"
#define IS_TRUE == "true"
......@@ -70,7 +70,7 @@ const account_function AccountPrivate::stateMachineActionsOnState[6][7] = {
AccountPrivate::AccountPrivate(Account* acc) : QObject(acc),q_ptr(acc),m_pCredentials(nullptr),m_pCodecModel(nullptr),
m_LastErrorCode(-1),m_VoiceMailCount(0),m_pRingToneModel(nullptr),
m_CurrentState(Account::EditState::READY),
m_pAccountNumber(nullptr),m_pKeyExchangeModel(nullptr),m_pSecurityValidationModel(nullptr),m_pTlsMethodModel(nullptr),
m_pAccountNumber(nullptr),m_pKeyExchangeModel(nullptr),m_pSecurityEvaluationModel(nullptr),m_pTlsMethodModel(nullptr),
m_pCaCert(nullptr),m_pTlsCert(nullptr),m_pPrivateKey(nullptr),m_isLoaded(true),m_pCipherModel(nullptr),
m_pStatusModel(nullptr),m_LastTransportCode(0),m_RegistrationState(Account::RegistrationState::UNREGISTERED),
m_UseDefaultPort(false),m_pProtocolModel(nullptr),m_pBootstrapModel(nullptr)
......@@ -393,12 +393,12 @@ AccountStatusModel* Account::statusModel() const
return d_ptr->m_pStatusModel;
}
SecurityValidationModel* Account::securityValidationModel() const
SecurityEvaluationModel* Account::securityValidationModel() const
{
if (!d_ptr->m_pSecurityValidationModel) {
d_ptr->m_pSecurityValidationModel = new SecurityValidationModel(const_cast<Account*>(this));
if (!d_ptr->m_pSecurityEvaluationModel) {
d_ptr->m_pSecurityEvaluationModel = new SecurityEvaluationModel(const_cast<Account*>(this));
}
return d_ptr->m_pSecurityValidationModel;
return d_ptr->m_pSecurityEvaluationModel;
}
TlsMethodModel* Account::tlsMethodModel() const
......@@ -1752,8 +1752,8 @@ void AccountPrivate::outdate() {
void AccountPrivate::regenSecurityValidation()
{
if (m_pSecurityValidationModel) {
m_pSecurityValidationModel->d_ptr->update();
if (m_pSecurityEvaluationModel) {
m_pSecurityEvaluationModel->d_ptr->update();
}
}
......
src/account.h
+ 2
− 2
View file @ 4575d629
......@@ -34,7 +34,7 @@ class QString;
class CredentialModel ;
class RingToneModel ;
class ContactMethod ;
class SecurityValidationModel;
class SecurityEvaluationModel;
class Certificate ;
class CipherModel ;
class AccountStatusModel ;
......@@ -252,7 +252,7 @@ class LIB_EXPORT Account : public QObject {
Q_INVOKABLE KeyExchangeModel* keyExchangeModel () const;
Q_INVOKABLE CipherModel* cipherModel () const;
Q_INVOKABLE AccountStatusModel* statusModel () const;
Q_INVOKABLE SecurityValidationModel* securityValidationModel() const;
Q_INVOKABLE SecurityEvaluationModel* securityValidationModel() const;
Q_INVOKABLE TlsMethodModel* tlsMethodModel () const;
Q_INVOKABLE ProtocolModel* protocolModel () const;
Q_INVOKABLE BootstrapModel* bootstrapModel () const;
......
src/private/account_p.h
+ 1
− 1
View file @ 4575d629
......@@ -106,7 +106,7 @@ public:
KeyExchangeModel* m_pKeyExchangeModel;
CipherModel* m_pCipherModel ;
AccountStatusModel* m_pStatusModel ;
SecurityValidationModel* m_pSecurityValidationModel;
SecurityEvaluationModel* m_pSecurityEvaluationModel;
TlsMethodModel* m_pTlsMethodModel ;
ProtocolModel* m_pProtocolModel ;
BootstrapModel* m_pBootstrapModel ;
......
src/private/securityvalidationmodel_p.h → src/private/securityevaluationmodel_p.h
+ 10
− 10
View file @ 4575d629
......@@ -25,31 +25,31 @@ class Certificate;
#include <certificate.h>
#include "private/matrixutils.h"
class SecurityValidationModelPrivate : public QObject
class SecurityEvaluationModelPrivate : public QObject
{
public:
SecurityValidationModelPrivate(Account* account, SecurityValidationModel* parent);
SecurityEvaluationModelPrivate(Account* account, SecurityEvaluationModel* parent);
//Attributes
QList<SecurityFlaw*> m_lCurrentFlaws ;
SecurityValidationModel::SecurityLevel m_CurrentSecurityLevel;
SecurityEvaluationModel::SecurityLevel m_CurrentSecurityLevel;
Account* m_pAccount ;
QHash< int, QHash< int, SecurityFlaw* > > m_hFlaws;
bool m_isScheduled;
int m_SeverityCount[enum_class_size<SecurityValidationModel::Severity>()];
int m_SeverityCount[enum_class_size<SecurityEvaluationModel::Severity>()];
///Messages to show to the end user
static const QString messages[enum_class_size<SecurityValidationModel::AccountSecurityFlaw>()];
static const QString messages[enum_class_size<SecurityEvaluationModel::AccountSecurityFlaw>()];
//Static mapping
static const TypedStateMachine< SecurityValidationModel::SecurityLevel , SecurityValidationModel::AccountSecurityFlaw > maximumSecurityLevel;
static const TypedStateMachine< SecurityValidationModel::Severity , SecurityValidationModel::AccountSecurityFlaw > flawSeverity ;
static const TypedStateMachine< SecurityEvaluationModel::SecurityLevel , SecurityEvaluationModel::AccountSecurityFlaw > maximumSecurityLevel;
static const TypedStateMachine< SecurityEvaluationModel::Severity , SecurityEvaluationModel::AccountSecurityFlaw > flawSeverity ;
static const TypedStateMachine< SecurityValidationModel::SecurityLevel , Certificate::Checks > maximumCertificateSecurityLevel;
static const TypedStateMachine< SecurityValidationModel::Severity , Certificate::Checks > certificateFlawSeverity ;
static const TypedStateMachine< SecurityEvaluationModel::SecurityLevel , Certificate::Checks > maximumCertificateSecurityLevel;
static const TypedStateMachine< SecurityEvaluationModel::Severity , Certificate::Checks > certificateFlawSeverity ;
SecurityValidationModel* q_ptr;
SecurityEvaluationModel* q_ptr;
public Q_SLOTS:
void update();
......
src/private/securityflaw_p.h
+ 4
− 4
View file @ 4575d629
......@@ -20,18 +20,18 @@
#include <QtCore/QObject>
#include "securityvalidationmodel.h"
#include "securityevaluationmodel.h"
class SecurityFlaw;
class SecurityFlawPrivate : public QObject
{
Q_OBJECT
public:
SecurityFlawPrivate(SecurityFlaw* parent, SecurityValidationModel::AccountSecurityFlaw f,Certificate::Type type);
SecurityFlawPrivate(SecurityFlaw* parent, SecurityEvaluationModel::AccountSecurityFlaw f,Certificate::Type type);
//Attributes
SecurityValidationModel::AccountSecurityFlaw m_flaw;
SecurityValidationModel::Severity m_severity;
SecurityEvaluationModel::AccountSecurityFlaw m_flaw;
SecurityEvaluationModel::Severity m_severity;
Certificate::Type m_certType;
int m_Row;
......
src/securityvalidationmodel.h → src/securityevaluationmodel.h
+ 9
− 9
View file @ 4575d629
......@@ -29,7 +29,7 @@
class Account;
class SecurityFlaw;
class SecurityValidationModelPrivate;
class SecurityEvaluationModelPrivate;
/**
* This model provide a real time look at elements security. It aggregate data
......@@ -41,7 +41,7 @@ class SecurityValidationModelPrivate;
* by this system. Result should be taken with a grain of salt, but at least some
* common problems can be detected.
*/
class LIB_EXPORT SecurityValidationModel : public QSortFilterProxyModel {
class LIB_EXPORT SecurityEvaluationModel : public QSortFilterProxyModel {
Q_OBJECT
friend class SecurityFlaw;
friend class AccountPrivate;
......@@ -119,8 +119,8 @@ public:
};
//Constructor
explicit SecurityValidationModel(Account* account);
virtual ~SecurityValidationModel();
explicit SecurityEvaluationModel(Account* account);
virtual ~SecurityEvaluationModel();
//Model functions
virtual QHash<int,QByteArray> roleNames() const override;
......@@ -145,11 +145,11 @@ Q_SIGNALS:
void securityLevelChanged ();
private:
SecurityValidationModelPrivate* d_ptr;
Q_DECLARE_PRIVATE(SecurityValidationModel)
SecurityEvaluationModelPrivate* d_ptr;
Q_DECLARE_PRIVATE(SecurityEvaluationModel)
};
Q_DECLARE_METATYPE(SecurityValidationModel*)
Q_DECLARE_METATYPE(SecurityValidationModel::Severity)
Q_DECLARE_METATYPE(SecurityValidationModel::SecurityLevel)
Q_DECLARE_METATYPE(SecurityEvaluationModel*)
Q_DECLARE_METATYPE(SecurityEvaluationModel::Severity)
Q_DECLARE_METATYPE(SecurityEvaluationModel::SecurityLevel)
#endif
src/securityflaw.cpp
+ 6
− 6
View file @ 4575d629
......@@ -18,16 +18,16 @@
#include "securityflaw.h"
//Ring
#include "private/securityvalidationmodel_p.h"
#include "private/securityevaluationmodel_p.h"
#include "private/securityflaw_p.h"
SecurityFlawPrivate::SecurityFlawPrivate(SecurityFlaw* parent, SecurityValidationModel::AccountSecurityFlaw f,Certificate::Type type):m_flaw(f),m_certType(type),m_Row(-1)
,m_severity(SecurityValidationModelPrivate::flawSeverity[f]),q_ptr(parent)
SecurityFlawPrivate::SecurityFlawPrivate(SecurityFlaw* parent, SecurityEvaluationModel::AccountSecurityFlaw f,Certificate::Type type):m_flaw(f),m_certType(type),m_Row(-1)
,m_severity(SecurityEvaluationModelPrivate::flawSeverity[f]),q_ptr(parent)
{
}
SecurityFlaw::SecurityFlaw(SecurityValidationModel::AccountSecurityFlaw f,Certificate::Type type)
SecurityFlaw::SecurityFlaw(SecurityEvaluationModel::AccountSecurityFlaw f,Certificate::Type type)
: QObject(), d_ptr(new SecurityFlawPrivate(this, f, type))
{
}
......@@ -37,12 +37,12 @@ Certificate::Type SecurityFlaw::type() const
return d_ptr->m_certType;
}
SecurityValidationModel::AccountSecurityFlaw SecurityFlaw::flaw() const
SecurityEvaluationModel::AccountSecurityFlaw SecurityFlaw::flaw() const
{
return d_ptr->m_flaw;
}
SecurityValidationModel::Severity SecurityFlaw::severity() const
SecurityEvaluationModel::Severity SecurityFlaw::severity() const
{
return d_ptr->m_severity;
}
......
src/securityflaw.h
+ 6
− 6
View file @ 4575d629
......@@ -22,7 +22,7 @@
#include <typedefs.h>
#include <securityvalidationmodel.h>
#include <securityevaluationmodel.h>
class SecurityFlawPrivate;
......@@ -30,8 +30,8 @@ class SecurityFlawPrivate;
class LIB_EXPORT SecurityFlaw : public QObject
{
Q_OBJECT
friend class SecurityValidationModel;
friend class SecurityValidationModelPrivate;
friend class SecurityEvaluationModel;
friend class SecurityEvaluationModelPrivate;
public:
//Operators
......@@ -40,11 +40,11 @@ public:
//Getter
Certificate::Type type() const;
SecurityValidationModel::AccountSecurityFlaw flaw() const;
SecurityValidationModel::Severity severity() const;
SecurityEvaluationModel::AccountSecurityFlaw flaw() const;
SecurityEvaluationModel::Severity severity() const;
private:
explicit SecurityFlaw(SecurityValidationModel::AccountSecurityFlaw f,Certificate::Type type = Certificate::Type::NONE);
explicit SecurityFlaw(SecurityEvaluationModel::AccountSecurityFlaw f,Certificate::Type type = Certificate::Type::NONE);
SecurityFlawPrivate* d_ptr;
Q_DECLARE_PRIVATE(SecurityFlaw)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment