Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-07-08 08:27:45 +02:00
Code Issues Projects Releases Wiki Activity

2023-05-25 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a bug in the podcasting subsystem that could cause SFTP
	operations to fail due to unknown SSH host certificates.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2023-05-25 11:21:31 -04:00
parent 02b0e9d979
commit cb290a2226
5 changed files with 90 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -24171,3 +24171,6 @@
2023-05-23 Fred Gleason <fredg@paravelsystems.com> 2023-05-23 Fred Gleason <fredg@paravelsystems.com>
* Added support for firewalld to the 'rivendell' DEB package. * Added support for firewalld to the 'rivendell' DEB package.
* Added CDN scripts to the 'rivendell' DEB package. * Added CDN scripts to the 'rivendell' DEB package.
2023-05-25 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in the podcasting subsystem that could cause SFTP
operations to fail due to unknown SSH host certificates.

4
lib/rddelete.cpp
View File

@ -2,7 +2,7 @@
// //
// Delete a file from the audio store via the Rivendell Web Service // Delete a file from the audio store via the Rivendell Web Service
// //
// (C) Copyright 2010-2021 Fred Gleason <fredg@paravelsystems.com> // (C) Copyright 2010-2023 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
@ -127,12 +127,14 @@ RDDelete::ErrorCode RDDelete::runDelete(const QString &username,
// //
if((conv_target_url.scheme().toLower()=="sftp")&& if((conv_target_url.scheme().toLower()=="sftp")&&
(!id_filename.isEmpty())&&use_id_filename) { (!id_filename.isEmpty())&&use_id_filename) {
curl_easy_setopt(curl,CURLOPT_SSL_VERIFYHOST,0); // Don't verify hostkey
curl_easy_setopt(curl,CURLOPT_USERNAME,username.toUtf8().constData()); curl_easy_setopt(curl,CURLOPT_USERNAME,username.toUtf8().constData());
curl_easy_setopt(curl,CURLOPT_SSH_PRIVATE_KEYFILE, curl_easy_setopt(curl,CURLOPT_SSH_PRIVATE_KEYFILE,
id_filename.toUtf8().constData()); id_filename.toUtf8().constData());
curl_easy_setopt(curl,CURLOPT_KEYPASSWD,password.toUtf8().constData()); curl_easy_setopt(curl,CURLOPT_KEYPASSWD,password.toUtf8().constData());
} }
else { else {
curl_easy_setopt(curl,CURLOPT_SSL_VERIFYHOST,0); // Don't verify hostkey
curl_easy_setopt(curl,CURLOPT_USERPWD, curl_easy_setopt(curl,CURLOPT_USERPWD,
(username+":"+password).toUtf8().constData()); (username+":"+password).toUtf8().constData());
} }

8
lib/rdfeed.cpp
View File

@ -46,6 +46,8 @@
#include "rdxport_interface.h" #include "rdxport_interface.h"
#include "rdxsltengine.h" #include "rdxsltengine.h"
// #define ENABLE_EXTENDED_CURL_LOGGING
int __RDFeed_Debug_Callback(CURL *handle,curl_infotype type,char *data, int __RDFeed_Debug_Callback(CURL *handle,curl_infotype type,char *data,
size_t size,void *userptr) size_t size,void *userptr)
{ {
@ -942,10 +944,8 @@ bool RDFeed::postPodcast(unsigned cast_id,QString *err_msg)
*err_msg=tr("Unspecified error"); *err_msg=tr("Unspecified error");
} }
delete wr; delete wr;
delete err_msgs;
return false; return false;
} }
delete err_msgs;
return true; return true;
} }
@ -2553,9 +2553,11 @@ QStringList *RDFeed::SetupCurlLogging(CURL *curl) const
{ {
QStringList *err_msgs=new QStringList(); QStringList *err_msgs=new QStringList();
#ifdef ENABLE_EXTENDED_CURL_LOGGING
curl_easy_setopt(curl,CURLOPT_DEBUGFUNCTION,__RDFeed_Debug_Callback); curl_easy_setopt(curl,CURLOPT_DEBUGFUNCTION,__RDFeed_Debug_Callback);
curl_easy_setopt(curl,CURLOPT_DEBUGDATA,err_msgs); curl_easy_setopt(curl,CURLOPT_DEBUGDATA,err_msgs);
curl_easy_setopt(curl,CURLOPT_VERBOSE,1); curl_easy_setopt(curl,CURLOPT_VERBOSE,1);
#endif // ENABLE_EXTENDED_CURL_LOGGING
return err_msgs; return err_msgs;
} }
@ -2564,6 +2566,7 @@ QStringList *RDFeed::SetupCurlLogging(CURL *curl) const
void RDFeed::ProcessCurlLogging(const QString &label, void RDFeed::ProcessCurlLogging(const QString &label,
QStringList *err_msgs) const QStringList *err_msgs) const
{ {
#ifdef ENABLE_EXTENDED_CURL_LOGGING
if(err_msgs->size()>0) { if(err_msgs->size()>0) {
rda->syslog(LOG_ERR,"*** %s: extended CURL information begins ***", rda->syslog(LOG_ERR,"*** %s: extended CURL information begins ***",
label.toUtf8().constData()); label.toUtf8().constData());
@ -2573,6 +2576,7 @@ void RDFeed::ProcessCurlLogging(const QString &label,
rda->syslog(LOG_ERR,"*** %s: extended CURL information ends ***", rda->syslog(LOG_ERR,"*** %s: extended CURL information ends ***",
label.toUtf8().constData()); label.toUtf8().constData());
} }
#endif // ENABLE_EXTENDED_CURL_LOGGING
delete err_msgs; delete err_msgs;
} }

84
web/rdxport/podcasts.cpp
View File

@ -43,19 +43,36 @@
#include "rdxport.h" #include "rdxport.h"
// #define ENABLE_EXTENDED_CURL_LOGGING
int __PostRss_Debug_Callback(CURL *handle,curl_infotype type,char *data,
size_t size,void *userptr)
{
QStringList *lines=(QStringList *)userptr;
if(type==CURLINFO_TEXT) {
lines->push_back(QString::fromUtf8(QByteArray(data,size)));
}
return 0;
}
size_t __PostRss_UploadFunction_Callback(char *buffer,size_t size, size_t __PostRss_UploadFunction_Callback(char *buffer,size_t size,
size_t nitems,void *userdata) size_t nitems,void *userdata)
{ {
Xport *xport=(Xport *)userdata; Xport *xport=(Xport *)userdata;
int curlsize=size*nitems; int curlsize=size*nitems;
int segsize=xport->xport_curl_data.size()-xport->xport_curl_data_ptr; int segsize=
xport->xport_curl_upload_data.size()-xport->xport_curl_upload_data_ptr;
if(segsize<curlsize) { if(segsize<curlsize) {
curlsize=segsize; curlsize=segsize;
} }
memcpy(buffer,xport->xport_curl_data.mid(xport->xport_curl_data_ptr,curlsize).constData(), memcpy(buffer,xport->xport_curl_upload_data.
mid(xport->xport_curl_upload_data_ptr,curlsize).constData(),
curlsize); curlsize);
xport->xport_curl_data_ptr+=curlsize; xport->xport_curl_upload_data_ptr+=curlsize;
return curlsize; return curlsize;
} }
@ -65,7 +82,7 @@ size_t __PostRss_DownloadFunction_Callback(char *buffer,size_t size,
{ {
Xport *xport=(Xport *)userdata; Xport *xport=(Xport *)userdata;
(xport->xport_curl_data)+=QByteArray(buffer,size*nitems); (xport->xport_curl_download_data)+=QByteArray(buffer,size*nitems);
return size*nitems; return size*nitems;
} }
@ -439,7 +456,7 @@ void Xport::DownloadRss() // Download feed XML from the remote archive
// //
curl_easy_setopt(curl,CURLOPT_URL,feed->feedUrl().toUtf8().constData()); curl_easy_setopt(curl,CURLOPT_URL,feed->feedUrl().toUtf8().constData());
curl_easy_setopt(curl,CURLOPT_UPLOAD,0); curl_easy_setopt(curl,CURLOPT_UPLOAD,0);
xport_curl_data.clear(); xport_curl_download_data.clear();
curl_easy_setopt(curl,CURLOPT_WRITEFUNCTION, curl_easy_setopt(curl,CURLOPT_WRITEFUNCTION,
__PostRss_DownloadFunction_Callback); __PostRss_DownloadFunction_Callback);
curl_easy_setopt(curl,CURLOPT_WRITEDATA,this); curl_easy_setopt(curl,CURLOPT_WRITEDATA,this);
@ -472,7 +489,7 @@ void Xport::DownloadRss() // Download feed XML from the remote archive
printf("Content-type: application/rss+xml; charset: UTF-8\n"); printf("Content-type: application/rss+xml; charset: UTF-8\n");
printf("Status: 200\n\n"); printf("Status: 200\n\n");
printf("%s",xport_curl_data.constData()); printf("%s",xport_curl_download_data.constData());
Exit(0); Exit(0);
} }
@ -497,7 +514,7 @@ bool Xport::PostRssElemental(RDFeed *feed,const QDateTime &now,QString *err_msg)
// internal Rivendell hashes remain consistent. // internal Rivendell hashes remain consistent.
// //
QDateTime epoch(QDate(1970,1,1),QTime(0,0,0)); QDateTime epoch(QDate(1970,1,1),QTime(0,0,0));
QString new_hash=RDSha1HashData(xport_curl_data=feed-> QString new_hash=RDSha1HashData(xport_curl_upload_data=feed->
rssXml(err_msg,epoch,&ok).toUtf8()); rssXml(err_msg,epoch,&ok).toUtf8());
if(feed->sha1Hash()==new_hash) { if(feed->sha1Hash()==new_hash) {
rda->syslog(LOG_DEBUG, rda->syslog(LOG_DEBUG,
@ -506,8 +523,8 @@ bool Xport::PostRssElemental(RDFeed *feed,const QDateTime &now,QString *err_msg)
return true; return true;
} }
xport_curl_data=feed->rssXml(err_msg,now,&ok).toUtf8(); xport_curl_upload_data=feed->rssXml(err_msg,now,&ok).toUtf8();
xport_curl_data_ptr=0; xport_curl_upload_data_ptr=0;
// //
@ -733,8 +750,8 @@ void Xport::PostImage() // Upload podcast image to the remote archive
q=new RDSqlQuery(sql); q=new RDSqlQuery(sql);
if(q->first()) { if(q->first()) {
feed_id=q->value(0).toUInt(); feed_id=q->value(0).toUInt();
xport_curl_data=q->value(1).toByteArray(); xport_curl_upload_data=q->value(1).toByteArray();
xport_curl_data_ptr=0; xport_curl_upload_data_ptr=0;
file_ext=q->value(2).toString(); file_ext=q->value(2).toString();
} }
delete q; delete q;
@ -761,6 +778,10 @@ void Xport::PostImage() // Upload podcast image to the remote archive
// //
if((QUrl(feed->feedUrl()).scheme().toLower()=="sftp")&& if((QUrl(feed->feedUrl()).scheme().toLower()=="sftp")&&
(!rda->station()->sshIdentityFile().isEmpty())&&feed->purgeUseIdFile()) { (!rda->station()->sshIdentityFile().isEmpty())&&feed->purgeUseIdFile()) {
//
// Disable host key verification
//
curl_easy_setopt(curl,CURLOPT_SSL_VERIFYHOST,0);
curl_easy_setopt(curl,CURLOPT_USERNAME, curl_easy_setopt(curl,CURLOPT_USERNAME,
feed->purgeUsername().toUtf8().constData()); feed->purgeUsername().toUtf8().constData());
curl_easy_setopt(curl,CURLOPT_SSH_PRIVATE_KEYFILE, curl_easy_setopt(curl,CURLOPT_SSH_PRIVATE_KEYFILE,
@ -769,6 +790,10 @@ void Xport::PostImage() // Upload podcast image to the remote archive
feed->purgePassword().toUtf8().constData()); feed->purgePassword().toUtf8().constData());
} }
else { else {
//
// Disable host key verification
//
curl_easy_setopt(curl,CURLOPT_SSL_VERIFYHOST,0);
curl_easy_setopt(curl,CURLOPT_USERNAME, curl_easy_setopt(curl,CURLOPT_USERNAME,
feed->purgeUsername().toUtf8().constData()); feed->purgeUsername().toUtf8().constData());
curl_easy_setopt(curl,CURLOPT_PASSWORD, curl_easy_setopt(curl,CURLOPT_PASSWORD,
@ -778,9 +803,10 @@ void Xport::PostImage() // Upload podcast image to the remote archive
// //
// Transfer Parameters // Transfer Parameters
// //
QStringList *err_msgs=SetupCurlLogging(curl);
curl_easy_setopt(curl,CURLOPT_URL,desturl.toUtf8().constData()); curl_easy_setopt(curl,CURLOPT_URL,desturl.toUtf8().constData());
curl_easy_setopt(curl,CURLOPT_UPLOAD,1); curl_easy_setopt(curl,CURLOPT_UPLOAD,1);
curl_easy_setopt(curl,CURLOPT_READFUNCTION, __PostRss_UploadFunction_Callback); curl_easy_setopt(curl,CURLOPT_READFUNCTION,__PostRss_UploadFunction_Callback);
curl_easy_setopt(curl,CURLOPT_READDATA,this); curl_easy_setopt(curl,CURLOPT_READDATA,this);
curl_easy_setopt(curl,CURLOPT_TIMEOUT,RD_CURL_TIMEOUT); curl_easy_setopt(curl,CURLOPT_TIMEOUT,RD_CURL_TIMEOUT);
curl_easy_setopt(curl,CURLOPT_NOPROGRESS,1); curl_easy_setopt(curl,CURLOPT_NOPROGRESS,1);
@ -803,9 +829,11 @@ void Xport::PostImage() // Upload podcast image to the remote archive
ret=false; ret=false;
break; break;
} }
ProcessCurlLogging("RDFeed::postImage()",err_msgs);
curl_easy_cleanup(curl); curl_easy_cleanup(curl);
if(!ret) { if(!ret) {
rda->syslog(LOG_NOTICE,"errstr: %s errnum: %d",errstr,curl_err);
XmlExit(err_msg,500,"podcasts.cpp",LINE_NUMBER); XmlExit(err_msg,500,"podcasts.cpp",LINE_NUMBER);
} }
@ -918,3 +946,35 @@ void Xport::RunCdnScript(const QString &cmd,const QStringList &args)
} }
delete proc; delete proc;
} }
QStringList *Xport::SetupCurlLogging(CURL *curl) const
{
QStringList *err_msgs=new QStringList();
#ifdef ENABLE_EXTENDED_CURL_LOGGING
curl_easy_setopt(curl,CURLOPT_DEBUGFUNCTION,__PostRss_Debug_Callback);
curl_easy_setopt(curl,CURLOPT_DEBUGDATA,err_msgs);
curl_easy_setopt(curl,CURLOPT_VERBOSE,1);
#endif // ENABLE_EXTENDED_CURL_LOGGING
return err_msgs;
}
void Xport::ProcessCurlLogging(const QString &label,
QStringList *err_msgs) const
{
#ifdef ENABLE_EXTENDED_CURL_LOGGING
if(err_msgs->size()>0) {
rda->syslog(LOG_ERR,"*** %s: extended CURL information begins ***",
label.toUtf8().constData());
for(int i=0;i<err_msgs->size();i++) {
rda->syslog(LOG_ERR,"[%d]: %s",i,err_msgs->at(i).toUtf8().constData());
}
rda->syslog(LOG_ERR,"*** %s: extended CURL information ends ***",
label.toUtf8().constData());
}
#endif // ENABLE_EXTENDED_CURL_LOGGING
delete err_msgs;
}

8
web/rdxport/rdxport.h
View File

@ -110,13 +110,17 @@ class Xport : public QObject
RDFormPost *xport_post; RDFormPost *xport_post;
QString xport_remote_hostname; QString xport_remote_hostname;
QHostAddress xport_remote_address; QHostAddress xport_remote_address;
QByteArray xport_curl_data; // QByteArray xport_curl_data;
int xport_curl_data_ptr; QByteArray xport_curl_upload_data;
QByteArray xport_curl_download_data;
int xport_curl_upload_data_ptr;
friend size_t __PostRss_UploadFunction_Callback(char *buffer,size_t size, friend size_t __PostRss_UploadFunction_Callback(char *buffer,size_t size,
size_t nitems,void *userdata); size_t nitems,void *userdata);
friend size_t __PostRss_DownloadFunction_Callback(char *buffer,size_t size, friend size_t __PostRss_DownloadFunction_Callback(char *buffer,size_t size,
size_t nitems, size_t nitems,
void *userdata); void *userdata);
QStringList *SetupCurlLogging(CURL *curl) const;
void ProcessCurlLogging(const QString &label,QStringList *err_msgs) const;
}; };