Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-10-10 16:43:35 +02:00
Code Issues Projects Releases Wiki Activity

2017-07-06 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Added an 'RDEscapeShellString()' function in 'lib/rdescape_string.h'
	and 'lib/rdescape_string.cpp'.
	* Fixed a bug in 'lib/rduser.cpp' that caused PAM authentication of
	accounts with a password containing one or more '$' characters to fail.
This commit is contained in:
Fred Gleason
2017-07-17 12:05:58 -04:00
parent 4d6187bb61
commit 095ee50edc
4 changed files with 16 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -15891,3 +15891,8 @@
* Removed RD_MAX_STATIONS from 'lib/rd.h'. * Removed RD_MAX_STATIONS from 'lib/rd.h'.
2017-07-06 Fred Gleason <fredg@paravelsystems.com> 2017-07-06 Fred Gleason <fredg@paravelsystems.com>
* Incremented the package version to 2.16.0int06. * Incremented the package version to 2.16.0int06.
2017-07-06 Fred Gleason <fredg@paravelsystems.com>
* Added an 'RDEscapeShellString()' function in 'lib/rdescape_string.h'
and 'lib/rdescape_string.cpp'.
* Fixed a bug in 'lib/rduser.cpp' that caused PAM authentication of
accounts with a password containing one or more '$' characters to fail.

83
lib/rdescape_string.cpp
View File

@@ -2,7 +2,7 @@
// //
// Escape non-valid characters in a string. // Escape non-valid characters in a string.
// //
// (C) Copyright 2002-2005,2016 Fred Gleason <fredg@paravelsystems.com> // (C) Copyright 2002-2005,2016-2017 Fred Gleason <fredg@paravelsystems.com>
// //
// This program is free software; you can redistribute it and/or modify // This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as // it under the terms of the GNU General Public License version 2 as
@@ -147,80 +147,11 @@ QString RDEscapeString(QString const &str)
} }
} }
/*
for(unsigned i=0;i<str.length();i++) {
switch(((const char *)str)[i]) {
case '(':
res+=QString("\\\(");
break;
case ')':
res+=QString("\\)");
break;
case '{':
res+=QString("\\\{");
break;
case '"':
res+=QString("\\\"");
break;
case '´':
res+=QString("\\´");
break;
case '`':
res+=QString("\\`");
break;
case '[':
res+=QString("\\\[");
break;
case '\'':
res+=QString("\\\'");
break;
case '\\':
res+=QString("\\");
res+=QString("\\");
break;
case '?':
res+=QString("\\\?");
break;
case ' ':
res+=QString("\\ ");
break;
case '&':
res+=QString("\\&");
break;
case ';':
res+=QString("\\;");
break;
case '<':
res+=QString("\\<");
break;
case '>':
res+=QString("\\>");
break;
case '|':
res+=QString("\\|");
break;
default:
res+=((const char *)str)[i];
break;
}
}
*/
return res; return res;
} }
QString RDEscapeShellString(QString str)
{
return "\""+str.replace("$","\\$")+"\"";
}

4
lib/rdescape_string.h
View File

@@ -2,7 +2,7 @@
// //
// Escape non-valid characters in a string. // Escape non-valid characters in a string.
// //
// (C) Copyright 2002-2005,2016 Fred Gleason <fredg@paravelsystems.com> // (C) Copyright 2002-2005,2016-2017 Fred Gleason <fredg@paravelsystems.com>
// //
// This program is free software; you can redistribute it and/or modify // This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as // it under the terms of the GNU General Public License version 2 as
@@ -28,7 +28,7 @@ QString RDCheckDateTime(const QTime &time, const QString &format);
QString RDCheckDateTime(const QDateTime &datetime, const QString &format); QString RDCheckDateTime(const QDateTime &datetime, const QString &format);
QString RDCheckDateTime(const QDate &date, const QString &format); QString RDCheckDateTime(const QDate &date, const QString &format);
QString RDEscapeString(const QString &str); QString RDEscapeString(const QString &str);
QString RDEscapeShellString(QString str);
#endif // RDESCAPE_STRING_H #endif // RDESCAPE_STRING_H

3
lib/rduser.cpp
View File

@@ -70,7 +70,8 @@ bool RDUser::authenticated(bool webuser) const
#ifndef WIN32 #ifndef WIN32
else { else {
QString cmd= QString cmd=
"rdauth "+pamService()+" \""+user_name+"\" \""+user_password+"\""; "rdauth "+pamService()+" "+RDEscapeShellString(user_name)+" "+
RDEscapeShellString(user_password);
int exitcode=system(cmd); int exitcode=system(cmd);
return WEXITSTATUS(exitcode)==0; return WEXITSTATUS(exitcode)==0;
} }