parent
fbe310b9b3
commit
e94ec8d119
19
data/Equifax_Secure_Certificate_Authority.pem
Normal file
19
data/Equifax_Secure_Certificate_Authority.pem
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
-----BEGIN CERTIFICATE-----
|
||||||
|
MIIDIDCCAomgAwIBAgIENd70zzANBgkqhkiG9w0BAQUFADBOMQswCQYDVQQGEwJV
|
||||||
|
UzEQMA4GA1UEChMHRXF1aWZheDEtMCsGA1UECxMkRXF1aWZheCBTZWN1cmUgQ2Vy
|
||||||
|
dGlmaWNhdGUgQXV0aG9yaXR5MB4XDTk4MDgyMjE2NDE1MVoXDTE4MDgyMjE2NDE1
|
||||||
|
MVowTjELMAkGA1UEBhMCVVMxEDAOBgNVBAoTB0VxdWlmYXgxLTArBgNVBAsTJEVx
|
||||||
|
dWlmYXggU2VjdXJlIENlcnRpZmljYXRlIEF1dGhvcml0eTCBnzANBgkqhkiG9w0B
|
||||||
|
AQEFAAOBjQAwgYkCgYEAwV2xWGcIYu6gmi0fCG2RFGiYCh7+2gRvE4RiIcPRfM6f
|
||||||
|
BeC4AfBONOziipUEZKzxa1NfBbPLZ4C/QgKO/t0BCezhABRP/PvwDN1Dulsr4R+A
|
||||||
|
cJkVV5MW8Q+XarfCaCMczE1ZMKxRHjuvK9buY0V7xdlfUNLjUA86iOe/FP3gx7kC
|
||||||
|
AwEAAaOCAQkwggEFMHAGA1UdHwRpMGcwZaBjoGGkXzBdMQswCQYDVQQGEwJVUzEQ
|
||||||
|
MA4GA1UEChMHRXF1aWZheDEtMCsGA1UECxMkRXF1aWZheCBTZWN1cmUgQ2VydGlm
|
||||||
|
aWNhdGUgQXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMBoGA1UdEAQTMBGBDzIwMTgw
|
||||||
|
ODIyMTY0MTUxWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAUSOZo+SvSspXXR9gj
|
||||||
|
IBBPM5iQn9QwHQYDVR0OBBYEFEjmaPkr0rKV10fYIyAQTzOYkJ/UMAwGA1UdEwQF
|
||||||
|
MAMBAf8wGgYJKoZIhvZ9B0EABA0wCxsFVjMuMGMDAgbAMA0GCSqGSIb3DQEBBQUA
|
||||||
|
A4GBAFjOKer89961zgK5F7WF0bnj4JXMJTENAKaSbn+2kmOeUJXRmm/kEd5jhW6Y
|
||||||
|
7qj/WsjTVbJmcVfewCHrPSqnI0kBBIZCe/zuf6IWUrVnZ9NA2zsmWLIodz2uFHdh
|
||||||
|
1voqZiegDfqnc1zqcPGUIWVEX/r87yloqaKHee9570+sB3c4
|
||||||
|
-----END CERTIFICATE-----
|
@ -1,5 +1,6 @@
|
|||||||
<RCC>
|
<RCC>
|
||||||
<qresource prefix="/">
|
<qresource prefix="/">
|
||||||
|
<file>Equifax_Secure_Certificate_Authority.pem</file>
|
||||||
<file>blank.ttf</file>
|
<file>blank.ttf</file>
|
||||||
<file>clementine_remote_qr.png</file>
|
<file>clementine_remote_qr.png</file>
|
||||||
<file>clementine-spotify-public.pem</file>
|
<file>clementine-spotify-public.pem</file>
|
||||||
|
@ -0,0 +1,19 @@
|
|||||||
|
-----BEGIN CERTIFICATE-----
|
||||||
|
MIIDIDCCAomgAwIBAgIENd70zzANBgkqhkiG9w0BAQUFADBOMQswCQYDVQQGEwJV
|
||||||
|
UzEQMA4GA1UEChMHRXF1aWZheDEtMCsGA1UECxMkRXF1aWZheCBTZWN1cmUgQ2Vy
|
||||||
|
dGlmaWNhdGUgQXV0aG9yaXR5MB4XDTk4MDgyMjE2NDE1MVoXDTE4MDgyMjE2NDE1
|
||||||
|
MVowTjELMAkGA1UEBhMCVVMxEDAOBgNVBAoTB0VxdWlmYXgxLTArBgNVBAsTJEVx
|
||||||
|
dWlmYXggU2VjdXJlIENlcnRpZmljYXRlIEF1dGhvcml0eTCBnzANBgkqhkiG9w0B
|
||||||
|
AQEFAAOBjQAwgYkCgYEAwV2xWGcIYu6gmi0fCG2RFGiYCh7+2gRvE4RiIcPRfM6f
|
||||||
|
BeC4AfBONOziipUEZKzxa1NfBbPLZ4C/QgKO/t0BCezhABRP/PvwDN1Dulsr4R+A
|
||||||
|
cJkVV5MW8Q+XarfCaCMczE1ZMKxRHjuvK9buY0V7xdlfUNLjUA86iOe/FP3gx7kC
|
||||||
|
AwEAAaOCAQkwggEFMHAGA1UdHwRpMGcwZaBjoGGkXzBdMQswCQYDVQQGEwJVUzEQ
|
||||||
|
MA4GA1UEChMHRXF1aWZheDEtMCsGA1UECxMkRXF1aWZheCBTZWN1cmUgQ2VydGlm
|
||||||
|
aWNhdGUgQXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMBoGA1UdEAQTMBGBDzIwMTgw
|
||||||
|
ODIyMTY0MTUxWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAUSOZo+SvSspXXR9gj
|
||||||
|
IBBPM5iQn9QwHQYDVR0OBBYEFEjmaPkr0rKV10fYIyAQTzOYkJ/UMAwGA1UdEwQF
|
||||||
|
MAMBAf8wGgYJKoZIhvZ9B0EABA0wCxsFVjMuMGMDAgbAMA0GCSqGSIb3DQEBBQUA
|
||||||
|
A4GBAFjOKer89961zgK5F7WF0bnj4JXMJTENAKaSbn+2kmOeUJXRmm/kEd5jhW6Y
|
||||||
|
7qj/WsjTVbJmcVfewCHrPSqnI0kBBIZCe/zuf6IWUrVnZ9NA2zsmWLIodz2uFHdh
|
||||||
|
1voqZiegDfqnc1zqcPGUIWVEX/r87yloqaKHee9570+sB3c4
|
||||||
|
-----END CERTIFICATE-----
|
@ -1,5 +1,6 @@
|
|||||||
<RCC>
|
<RCC>
|
||||||
<qresource prefix="/certs">
|
<qresource prefix="/certs">
|
||||||
|
<file>Equifax_Secure_Certificate_Authority.pem</file>
|
||||||
<file>godaddy-root.pem</file>
|
<file>godaddy-root.pem</file>
|
||||||
</qresource>
|
</qresource>
|
||||||
</RCC>
|
</RCC>
|
||||||
|
@ -57,6 +57,8 @@ int main(int argc, char** argv) {
|
|||||||
|
|
||||||
QSslSocket::addDefaultCaCertificates(
|
QSslSocket::addDefaultCaCertificates(
|
||||||
QSslCertificate::fromPath(":/certs/godaddy-root.pem", QSsl::Pem));
|
QSslCertificate::fromPath(":/certs/godaddy-root.pem", QSsl::Pem));
|
||||||
|
QSslSocket::addDefaultCaCertificates(
|
||||||
|
QSslCertificate::fromPath(":/certs/Equifax_Secure_Certificate_Authority.pem", QSsl::Pem));
|
||||||
|
|
||||||
TagReaderWorker worker(&socket);
|
TagReaderWorker worker(&socket);
|
||||||
|
|
||||||
|
@ -21,6 +21,7 @@
|
|||||||
#include "internet/core/oauthenticator.h"
|
#include "internet/core/oauthenticator.h"
|
||||||
|
|
||||||
#include <QDesktopServices>
|
#include <QDesktopServices>
|
||||||
|
#include <QSslError>
|
||||||
#include <QStringList>
|
#include <QStringList>
|
||||||
#include <QUrl>
|
#include <QUrl>
|
||||||
|
|
||||||
@ -114,6 +115,7 @@ void OAuthenticator::RequestAccessToken(const QByteArray& code,
|
|||||||
"application/x-www-form-urlencoded");
|
"application/x-www-form-urlencoded");
|
||||||
|
|
||||||
QNetworkReply* reply = network_.post(request, post_data.toUtf8());
|
QNetworkReply* reply = network_.post(request, post_data.toUtf8());
|
||||||
|
connect(reply, SIGNAL(sslErrors(QList<QSslError>)), SLOT(SslErrors(QList<QSslError>)));
|
||||||
NewClosure(reply, SIGNAL(finished()), this,
|
NewClosure(reply, SIGNAL(finished()), this,
|
||||||
SLOT(FetchAccessTokenFinished(QNetworkReply*)), reply);
|
SLOT(FetchAccessTokenFinished(QNetworkReply*)), reply);
|
||||||
}
|
}
|
||||||
@ -189,3 +191,9 @@ void OAuthenticator::RefreshAccessTokenFinished(QNetworkReply* reply) {
|
|||||||
SetExpiryTime(result["expires_in"].toInt());
|
SetExpiryTime(result["expires_in"].toInt());
|
||||||
emit Finished();
|
emit Finished();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void OAuthenticator::SslErrors(const QList<QSslError>& errors) {
|
||||||
|
for (const QSslError& error : errors) {
|
||||||
|
qLog(Debug) << error.errorString();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@ -68,6 +68,7 @@ class OAuthenticator : public QObject {
|
|||||||
void RedirectArrived(LocalRedirectServer* server, QUrl url);
|
void RedirectArrived(LocalRedirectServer* server, QUrl url);
|
||||||
void FetchAccessTokenFinished(QNetworkReply* reply);
|
void FetchAccessTokenFinished(QNetworkReply* reply);
|
||||||
void RefreshAccessTokenFinished(QNetworkReply* reply);
|
void RefreshAccessTokenFinished(QNetworkReply* reply);
|
||||||
|
void SslErrors(const QList<QSslError>& errors);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
static const char* kRemoteURL;
|
static const char* kRemoteURL;
|
||||||
|
@ -401,6 +401,8 @@ int main(int argc, char* argv[]) {
|
|||||||
// Add root CA cert for SoundCloud, whose certificate is missing on OS X.
|
// Add root CA cert for SoundCloud, whose certificate is missing on OS X.
|
||||||
QSslSocket::addDefaultCaCertificates(
|
QSslSocket::addDefaultCaCertificates(
|
||||||
QSslCertificate::fromPath(":/soundcloud-ca.pem", QSsl::Pem));
|
QSslCertificate::fromPath(":/soundcloud-ca.pem", QSsl::Pem));
|
||||||
|
QSslSocket::addDefaultCaCertificates(
|
||||||
|
QSslCertificate::fromPath(":/Equifax_Secure_Certificate_Authority.pem", QSsl::Pem));
|
||||||
|
|
||||||
// Has the user forced a different language?
|
// Has the user forced a different language?
|
||||||
QString override_language = options.language();
|
QString override_language = options.language();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user