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

2020-11-06 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a bug in Webget that caused authentication to fail
	when using PAM.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2020-11-06 14:27:43 -05:00
parent bb577beb76
commit 6d8e3f0fb7
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -20541,3 +20541,6 @@
2020-11-05 Fred Gleason <fredg@paravelsystems.com> 2020-11-05 Fred Gleason <fredg@paravelsystems.com>
* Added logging for failed PAM authentication in * Added logging for failed PAM authentication in
'RDPam::authenticate()'. 'RDPam::authenticate()'.
2020-11-06 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in Webget that caused authentication to fail
when using PAM.

23
web/webget/webget.cpp
View File

@ -464,7 +464,7 @@ void MainObject::ServeForm()
printf(" <input type=\"hidden\" name=\"LOGIN_NAME\" id=\"LOGIN_NAME\" value=\"%s\">\n", printf(" <input type=\"hidden\" name=\"LOGIN_NAME\" id=\"LOGIN_NAME\" value=\"%s\">\n",
rda->user()->name().toUtf8().constData()); rda->user()->name().toUtf8().constData());
printf(" <input type=\"hidden\" name=\"PASSWORD\" id=\"PASSWORD\" value=\"%s\">\n", printf(" <input type=\"hidden\" name=\"PASSWORD\" id=\"PASSWORD\" value=\"%s\">\n",
rda->user()->password().toUtf8().constData()); webget_remote_password.toUtf8().constData());
// //
// Get Audio // Get Audio
@ -571,10 +571,6 @@ void MainObject::ServeLogin()
// //
printf(" <body>\n"); printf(" <body>\n");
printf(" <form action=\"/rd-bin/webget.cgi\" method=\"post\" enctype=\"multipart/form-data\">\n"); printf(" <form action=\"/rd-bin/webget.cgi\" method=\"post\" enctype=\"multipart/form-data\">\n");
printf(" <input type=\"hidden\" name=\"LOGIN_NAME\" value=\"%s\">\n",
rda->user()->name().toUtf8().constData());
printf(" <input type=\"hidden\" name=\"PASSWORD\" value=\"%s\">\n",
rda->user()->password().toUtf8().constData());
printf(" <table style=\"margin: auto;padding: 10px 0\" cellpadding=\"0\" cellspacing=\"5\" border=\"0\">\n"); printf(" <table style=\"margin: auto;padding: 10px 0\" cellpadding=\"0\" cellspacing=\"5\" border=\"0\">\n");
printf(" <tr>\n"); printf(" <tr>\n");
printf(" <td colspan=\"2\"><img src=\"logos/webget_logo.png\" border=\"0\"></td>\n"); printf(" <td colspan=\"2\"><img src=\"logos/webget_logo.png\" border=\"0\"></td>\n");
@ -605,24 +601,23 @@ void MainObject::ServeLogin()
bool MainObject::Authenticate() bool MainObject::Authenticate()
{ {
QString name; if(!webget_post->getValue("LOGIN_NAME",&webget_remote_username)) {
QString passwd;
if(!webget_post->getValue("LOGIN_NAME",&name)) {
rda->syslog(LOG_WARNING,"missing LOGIN_NAME"); rda->syslog(LOG_WARNING,"missing LOGIN_NAME");
rda->logAuthenticationFailure(webget_post->clientAddress()); rda->logAuthenticationFailure(webget_post->clientAddress());
return false; return false;
} }
if(!webget_post->getValue("PASSWORD",&passwd)) { if(!webget_post->getValue("PASSWORD",&webget_remote_password)) {
rda->syslog(LOG_WARNING,"missing PASSWORD"); rda->syslog(LOG_WARNING,"missing PASSWORD");
rda->logAuthenticationFailure(webget_post->clientAddress(),name); rda->logAuthenticationFailure(webget_post->clientAddress(),
webget_remote_username);
return false; return false;
} }
rda->user()->setName(name); rda->user()->setName(webget_remote_username);
if((!rda->user()->exists())|| if((!rda->user()->exists())||
(!rda->user()->checkPassword(passwd,false))|| (!rda->user()->checkPassword(webget_remote_password,false))||
(!rda->user()->webgetLogin())) { (!rda->user()->webgetLogin())) {
rda->logAuthenticationFailure(webget_post->clientAddress(),name); rda->logAuthenticationFailure(webget_post->clientAddress(),
webget_remote_username);
return false; return false;
} }

2
web/webget/webget.h
View File

@ -50,6 +50,8 @@ class MainObject : public QObject
void TextExit(const QString &msg,int code,int line) const; void TextExit(const QString &msg,int code,int line) const;
RDFormPost *webget_post; RDFormPost *webget_post;
QString webget_remote_hostname; QString webget_remote_hostname;
QString webget_remote_username;
QString webget_remote_password;
QHostAddress webget_remote_address; QHostAddress webget_remote_address;
}; };