Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-11-26 15:20:29 +01:00
Code Issues Projects Releases Wiki Activity

2018-10-24 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Consolidated the implementation of the 'RDProfile' class into
	two files.
	* Added an rdselect_helper(1) SETUID helper program.
	* Removed the SETUID bit from rdselect(1).
This commit is contained in:
Fred Gleason
2018-10-24 15:34:35 -04:00
parent 4f8a5278fd
commit 9d25af4c5f
35 changed files with 1096 additions and 400 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
utils/rdselect_helper/Makefile.am Normal file
View File

@@ -0,0 +1,55 @@
## Makefile.am
##
## (C) Copyright 2018 Fred Gleason <fredg@paravelsystems.com>
##
## 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
## published by the Free Software Foundation.
##
## This program is distributed in the hope that it will be useful,
## but WITHOUT ANY WARRANTY; without even the implied warranty of
## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
## GNU General Public License for more details.
##
## You should have received a copy of the GNU General Public
## License along with this program; if not, write to the Free Software
## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
##
## Use automake to process this into a Makefile.in
AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" @QT4_CFLAGS@
MOC = @QT_MOC@
# The dependency for qt's Meta Object Compiler (moc)
moc_%.cpp: %.h
$(MOC) $< -o $@
install-exec-hook:
chmod 4755 $(DESTDIR)$(prefix)/bin/rdselect_helper
bin_PROGRAMS = rdselect_helper
dist_rdselect_helper_SOURCES = rdselect_helper.cpp rdselect_helper.h
nodist_rdselect_helper_SOURCES = moc_rdselect_helper.cpp\
rd.h\
rdconfig.cpp rdconfig.h\
rdprofile.cpp rdprofile.h
rdselect_helper_LDADD = -lQtCore -lQtNetwork -lQt3Support
CLEANFILES = *~\
*.idb\
*ilk\
*.obj\
*.pdb\
*.qm\
moc_*
DISTCLEANFILES = rd.h\
rdconfig.cpp rdconfig.h\
rdprofile.cpp rdprofile.h
MAINTAINERCLEANFILES = *~\
Makefile.in\
moc_*

258
utils/rdselect_helper/rdselect_helper.cpp Normal file
View File

@@ -0,0 +1,258 @@
// rdselect_help.cpp
//
// SETUID helper script for rdselect(1)
//
// (C) Copyright 2018 Fred Gleason <fredg@paravelsystems.com>
//
// 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
// published by the Free Software Foundation.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public
// License along with this program; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#include <errno.h>
#include <unistd.h>
#include <sys/mount.h>
#include <sys/types.h>
#include <qcoreapplication.h>
#include <qdir.h>
#include <qprocess.h>
#include "rd.h"
#include "rdselect_helper.h"
MainObject::MainObject(QObject *parent)
: QObject(parent)
{
setuid(geteuid()); // So the SETUID bit works as expected
if(getuid()!=0) {
fprintf(stderr,
"rdselect_helper: this program must be installed SETUID root\n");
exit(RDConfig::RDSelectNotRoot);
}
//
// Process argument
//
if(qApp->argc()!=2) {
fprintf(stderr,"rdselect_helper: you must pass exactly one argument\n");
exit(RDConfig::RDSelectInvalidArguments);
}
if(QString(qApp->argv()[1]).contains("/")||
QString(qApp->argv()[1]).contains("..")) {
fprintf(stderr,"rdselect_helper: invalid configuration name\n");
exit(RDConfig::RDSelectInvalidName);
}
helper_config_filename=
QString(RD_DEFAULT_RDSELECT_DIR)+"/"+QString(qApp->argv()[1]);
//
// Load Configurations
//
helper_config=new RDConfig();
helper_config->setFilename(helper_config_filename);
if(!helper_config->load()) {
fprintf(stderr,"rdselect_helper: no such configuration\n");
exit(RDConfig::RDSelectNoSuchConfiguration);
}
helper_prev_config=new RDConfig();
if(!helper_prev_config->load()) {
fprintf(stderr,"rdselect_helper: no current configuration found\n");
exit(RDConfig::RDSelectNoCurrentConfig);
}
//
// Check system state
//
if(ModulesActive()) {
fprintf(stderr,"rdselect_helper: one or more rivendell modules active\n");
exit(RDConfig::RDSelectModulesActive);
}
//
// Shutdown old setup
//
Shutdown();
//
// Startup new setup
//
Startup();
exit(RDConfig::RDSelectOk);
}
void MainObject::Startup()
{
QStringList args;
QProcess *proc=NULL;
//
// Mount the audio store
//
if(!helper_config->audioStoreMountSource().isEmpty()) {
args.clear();
if(!helper_config->audioStoreMountType().isEmpty()) {
args.push_back("-t");
args.push_back(helper_config->audioStoreMountType());
}
args.push_back("-o");
if(helper_config->audioStoreMountOptions().isEmpty()) {
args.push_back("defaults");
}
else {
args.push_back(helper_config->audioStoreMountOptions());
}
args.push_back(helper_config->audioStoreMountSource());
args.push_back(helper_config->audioRoot());
proc=new QProcess(this);
proc->start("/bin/mount",args);
proc->waitForFinished();
if(proc->exitStatus()!=QProcess::NormalExit) {
fprintf(stderr,"rdselect_helper: mount(8) command crashed\n");
exit(RDConfig::RDSelectMountCrashed);
}
if(proc->exitCode()!=0) {
fprintf(stderr,"rdselect_helper: mount exited with error code %d\n",
proc->exitCode());
exit(RDConfig::RDSelectAudioMountFailed);
}
delete proc;
}
//
// Start the rivendell service
//
unlink(RD_CONF_FILE);
if(symlink(helper_config_filename,RD_CONF_FILE)!=0) {
fprintf(stderr,"rdselect_helper: unable to create new symlink [%s]\n",
strerror(errno));
exit(RDConfig::RDSelectSymlinkFailed);
}
args.clear();
args.push_back("start");
args.push_back("rivendell");
proc=new QProcess(this);
proc->start("/bin/systemctl",args);
proc->waitForFinished();
if(proc->exitStatus()!=QProcess::NormalExit) {
fprintf(stderr,"rdselect_helper: systemctl(8) crashed\n");
exit(RDConfig::RDSelectSystemctlCrashed);
}
if(proc->exitCode()!=0) {
fprintf(stderr,"rdselect_helper: rivendell service start failed\n");
exit(RDConfig::RDSelectRivendellStartupFailed);
}
delete proc;
}
void MainObject::Shutdown()
{
QStringList args;
//
// Stop Rivendell Service
//
args.push_back("stop");
args.push_back("rivendell");
QProcess *proc=new QProcess(this);
proc->start("/bin/systemctl",args);
proc->waitForFinished();
if(proc->exitStatus()!=QProcess::NormalExit) {
fprintf(stderr,"rdselect_helper: systemctl(8) crashed\n");
exit(RDConfig::RDSelectSystemctlCrashed);
}
if(proc->exitCode()!=0) {
fprintf(stderr,"rdselect_helper: rivendell service shutdown failed\n");
exit(RDConfig::RDSelectRivendellShutdownFailed);
}
delete proc;
//
// Unmount the audio store
//
if(umount(helper_prev_config->audioRoot())!=0) {
if(errno!=EINVAL) { // Ignore the error if we're already unmounted
fprintf(stderr,"rdselect_helper: unmount of \"%s\" failed [%s]\n",
(const char *)helper_prev_config->audioRoot(),
strerror(errno));
exit(RDConfig::RDSelectAudioUnmountFailed);
}
}
}
bool MainObject::ProcessActive(const QStringList &cmds) const
{
QStringList dirs;
QDir *proc_dir=new QDir("/proc");
bool ok=false;
FILE *f=NULL;
char line[1024];
QString cmdline;
proc_dir->setFilter(QDir::Dirs);
dirs=proc_dir->entryList();
for(int i=0;i<dirs.size();i++) {
dirs[i].toInt(&ok);
if(ok) {
if((f=fopen(QString("/proc/")+dirs[i]+"/cmdline","r"))!=NULL) {
if(fgets(line,1024,f)!=NULL) {
QStringList f1=QString(line).split(" ",QString::SkipEmptyParts);
QStringList f2=f1[0].split("/",QString::SkipEmptyParts);
cmdline=f2[f2.size()-1];
for(int j=0;j<cmds.size();j++) {
if(cmdline==cmds[j]) {
fclose(f);
return true;
}
}
}
fclose(f);
}
}
}
delete proc_dir;
return false;
}
bool MainObject::ModulesActive() const
{
QStringList cmds;
cmds.push_back("rdadmin");
cmds.push_back("rdairplay");
cmds.push_back("rdcartslots");
cmds.push_back("rdcastmanager");
cmds.push_back("rdcatch");
cmds.push_back("rdlibrary");
cmds.push_back("rdlogedit");
cmds.push_back("rdlogin");
cmds.push_back("rdlogmanager");
cmds.push_back("rdpanel");
cmds.push_back("rddbmgr");
cmds.push_back("rdgpimon");
return ProcessActive(cmds);
}
int main(int argc,char *argv[])
{
QCoreApplication a(argc,argv);
new MainObject();
return a.exec();
}

49
utils/rdselect_helper/rdselect_helper.h Normal file
View File

@@ -0,0 +1,49 @@
// rdselect_help.h
//
// SETUID helper script for rdselect(1)
//
// (C) Copyright 2018 Fred Gleason <fredg@paravelsystems.com>
//
// 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
// published by the Free Software Foundation.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public
// License along with this program; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#ifndef RDSELECT_HELPER_H
#define RDSELECT_HELPER_H
#include <stdio.h>
#include <stdint.h>
#include <qobject.h>
#include <qstringlist.h>
#include "rdconfig.h"
class MainObject : public QObject
{
Q_OBJECT;
public:
MainObject(QObject *parent=0);
private:
void Startup();
void Shutdown();
bool ProcessActive(const QStringList &cmds) const;
bool ModulesActive() const;
QString helper_config_filename;
RDConfig *helper_config;
RDConfig *helper_prev_config;
};
#endif // RDSELECT_HELPER_H