Quit the proxy when reading zero or less from stdin

This commit is contained in:
varjolintu 2018-05-28 15:28:11 +03:00 committed by Jonathan White
parent 8db604e787
commit 1d80bddde3
5 changed files with 31 additions and 12 deletions

View File

@ -52,7 +52,7 @@ protected slots:
protected:
virtual void readLength() = 0;
virtual void readStdIn(const quint32 length) = 0;
virtual bool readStdIn(const quint32 length) = 0;
void readNativeMessages();
QString jsonToString(const QJsonObject& json) const;
void sendReply(const QJsonObject& json);

View File

@ -114,10 +114,10 @@ void NativeMessagingHost::readLength()
}
}
void NativeMessagingHost::readStdIn(const quint32 length)
bool NativeMessagingHost::readStdIn(const quint32 length)
{
if (length <= 0) {
return;
return false;
}
QByteArray arr;
@ -129,7 +129,7 @@ void NativeMessagingHost::readStdIn(const quint32 length)
int c = std::getchar();
if (c == EOF) {
// message ended prematurely, ignore it and return
return;
return false;
}
arr.append(static_cast<char>(c));
}
@ -137,6 +137,7 @@ void NativeMessagingHost::readStdIn(const quint32 length)
if (arr.length() > 0) {
sendReply(m_browserClients.readResponse(arr));
}
return true;
}
void NativeMessagingHost::newLocalConnection()

View File

@ -46,7 +46,7 @@ signals:
private:
void readLength();
void readStdIn(const quint32 length);
bool readStdIn(const quint32 length);
void sendReplyToAllClients(const QJsonObject& json);
private slots:

View File

@ -49,6 +49,21 @@ NativeMessagingHost::~NativeMessagingHost()
#endif
}
void NativeMessagingHost::readNativeMessages()
{
#ifdef Q_OS_WIN
quint32 length = 0;
while (m_running.load() && !std::cin.eof()) {
length = 0;
std::cin.read(reinterpret_cast<char*>(&length), 4);
if (!readStdIn(length)) {
QCoreApplication::quit();
}
QThread::msleep(1);
}
#endif
}
void NativeMessagingHost::readLength()
{
quint32 length = 0;
@ -60,10 +75,10 @@ void NativeMessagingHost::readLength()
}
}
void NativeMessagingHost::readStdIn(const quint32 length)
bool NativeMessagingHost::readStdIn(const quint32 length)
{
if (length <= 0) {
return;
return false;
}
QByteArray arr;
@ -73,7 +88,7 @@ void NativeMessagingHost::readStdIn(const quint32 length)
int c = std::getchar();
if (c == EOF) {
// message ended prematurely, ignore it and return
return;
return false;
}
arr.append(static_cast<char>(c));
}
@ -82,6 +97,8 @@ void NativeMessagingHost::readStdIn(const quint32 length)
m_localSocket->write(arr.constData(), arr.length());
m_localSocket->flush();
}
return true;
}
void NativeMessagingHost::newLocalMessage()

View File

@ -33,8 +33,9 @@ public slots:
void socketStateChanged(QLocalSocket::LocalSocketState socketState);
private:
void readNativeMessages();
void readLength();
void readStdIn(const quint32 length);
bool readStdIn(const quint32 length);
private:
QLocalSocket* m_localSocket;