Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-04-12 15:52:29 +02:00
Code Issues Projects Releases Wiki Activity

2017-04-05 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a regression in 'web/rdxport/rdxport.cpp' that broke
	the CreateTicket web API call when connecting from localhost
	or the machines registered IP address.
This commit is contained in:
Fred Gleason 2017-04-05 15:14:00 -04:00
parent 23df8ca675
commit 9eb7c12b1a
3 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -15712,3 +15712,7 @@
2017-04-05 Fred Gleason <fredg@paravelsystems.com>
* Fixed a regression in 'lib/carts.cpp' that broke cut listings
in the 'ListCarts' web API call.
2017-04-05 Fred Gleason <fredg@paravelsystems.com>
* Fixed a regression in 'web/rdxport/rdxport.cpp' that broke
the CreateTicket web API call when connecting from localhost
or the machines registered IP address.

26
web/rdxport/rdxport.cpp
View File

@ -282,14 +282,11 @@ Xport::Xport(QObject *parent)
bool Xport::Authenticate()
{
QString name;
QString passwd;
QString ticket;
int command;
QString sql;
RDSqlQuery *q;
unsigned char rawstr[1024];
unsigned char sha1[SHA_DIGEST_LENGTH];
QString name;
QString passwd;
//
// First, attempt ticket authentication
@ -322,6 +319,7 @@ bool Xport::Authenticate()
return false;
}
if((xport_post->clientAddress().toIPv4Address()>>24)==127) { // Localhost
TryCreateTicket(name);
return true;
}
sql=QString("select NAME from STATIONS where ")+
@ -329,6 +327,7 @@ bool Xport::Authenticate()
q=new RDSqlQuery(sql);
if(q->first()) {
delete q;
TryCreateTicket(name);
return true;
}
delete q;
@ -339,6 +338,21 @@ bool Xport::Authenticate()
if(!xport_user->checkPassword(passwd,false)) {
return false;
}
TryCreateTicket(name);
return true;
}
void Xport::TryCreateTicket(const QString &name)
{
QString ticket;
QString passwd;
int command;
unsigned char rawstr[1024];
unsigned char sha1[SHA_DIGEST_LENGTH];
QString sql;
RDSqlQuery *q;
if(xport_post->getValue("COMMAND",&command)) {
if(command==RDXPORT_COMMAND_CREATETICKET) {
@ -371,8 +385,6 @@ bool Xport::Authenticate()
exit(0);
}
}
return true;
}

1
web/rdxport/rdxport.h
View File

@ -38,6 +38,7 @@ class Xport : public QObject
private:
bool Authenticate();
void TryCreateTicket(const QString &name);
void Export();
void Import();
void DeleteAudio();