mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-06 14:16:32 +02:00
Code Issues Releases Wiki Activity

Comment out pubkey bits

Browse Source
This commit is contained in:
Jeff Mitchell
2014-03-01 08:34:42 -05:00
parent f931c1d9a8
commit ae9fd7bb0f
2 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/accounts/hatchet/sip/HatchetSip.cpp
View File

@@ -51,6 +51,7 @@ HatchetSipPlugin::HatchetSipPlugin( Tomahawk::Accounts::Account *account )
connect( m_account, SIGNAL( accessTokenFetched() ), this, SLOT( connectWebSocket() ) ); connect( m_account, SIGNAL( accessTokenFetched() ), this, SLOT( connectWebSocket() ) );
connect( Servent::instance(), SIGNAL( dbSyncTriggered() ), this, SLOT( dbSyncTriggered() )); connect( Servent::instance(), SIGNAL( dbSyncTriggered() ), this, SLOT( dbSyncTriggered() ));
/*
QFile pemFile( ":/hatchet-account/dreamcatcher.pem" ); QFile pemFile( ":/hatchet-account/dreamcatcher.pem" );
pemFile.open( QIODevice::ReadOnly ); pemFile.open( QIODevice::ReadOnly );
tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "certs/dreamcatcher.pem: " << pemFile.readAll(); tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "certs/dreamcatcher.pem: " << pemFile.readAll();
@@ -64,6 +65,7 @@ HatchetSipPlugin::HatchetSipPlugin( Tomahawk::Accounts::Account *account )
return; return;
} }
m_publicKey = new QCA::PublicKey( publicKey ); m_publicKey = new QCA::PublicKey( publicKey );
*/
m_reconnectTimer.setInterval( 0 ); m_reconnectTimer.setInterval( 0 );
m_reconnectTimer.setSingleShot( true ); m_reconnectTimer.setSingleShot( true );
@@ -90,7 +92,8 @@ HatchetSipPlugin::~HatchetSipPlugin()
bool bool
HatchetSipPlugin::isValid() const HatchetSipPlugin::isValid() const
{ {
return m_account->enabled() && m_account->isAuthenticated() && m_publicKey; //return m_account->enabled() && m_account->isAuthenticated() && m_publicKey;
return m_account->enabled() && m_account->isAuthenticated();
} }
@@ -189,8 +192,17 @@ HatchetSipPlugin::webSocketConnected()
hatchetAccount()->setConnectionState( Tomahawk::Accounts::Account::Connected ); hatchetAccount()->setConnectionState( Tomahawk::Accounts::Account::Connected );
m_sipState = AcquiringVersion; m_sipState = AcquiringVersion;
/*
m_uuid = QUuid::createUuid().toString();
QCA::SecureArray sa( m_uuid.toLatin1() );
QCA::SecureArray result = m_publicKey->encrypt( sa, QCA::EME_PKCS1_OAEP );
tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "uuid:" << m_uuid << ", size of uuid:" << m_uuid.size() << ", size of sa:" << sa.size() << ", size of result:" << result.size();
*/
QVariantMap nonceVerMap; QVariantMap nonceVerMap;
nonceVerMap[ "version" ] = VERSION; nonceVerMap[ "version" ] = VERSION;
//nonceVerMap[ "nonce" ] = QString( result.toByteArray().toBase64() );
sendBytes( nonceVerMap ); sendBytes( nonceVerMap );
} }
@@ -268,10 +280,10 @@ HatchetSipPlugin::messageReceived( const QByteArray &msg )
if ( m_sipState == AcquiringVersion ) if ( m_sipState == AcquiringVersion )
{ {
tLog() << Q_FUNC_INFO << "In acquiring version state, expecting version information"; tLog() << Q_FUNC_INFO << "In acquiring version state, expecting version/nonce information";
if ( !retMap.contains( "version" ) ) if ( !retMap.contains( "version" ) || !retMap.contains( "nonce" ) )
{ {
tLog() << Q_FUNC_INFO << "Failed to acquire version information"; tLog() << Q_FUNC_INFO << "Failed to acquire version or nonce information";
disconnectPlugin(); disconnectPlugin();
return; return;
} }
@@ -284,6 +296,13 @@ HatchetSipPlugin::messageReceived( const QByteArray &msg )
return; return;
} }
if ( retMap[ "nonce" ].toString() != m_uuid )
{
tLog() << Q_FUNC_INFO << "Failed to validate nonce";
disconnectPlugin();
return;
}
m_version = ver; m_version = ver;
QVariantMap registerMap; QVariantMap registerMap;