github/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/ZeroTier/ZeroTierOne synced 2025-08-20 13:24:09 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

More install/deploy work for mac...

Browse source
This commit is contained in:
Adam Ierymenko 2014-01-03 15:39:09 -08:00
commit 59b1623477
8 changed files with 82 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

14
ZeroTierUI/ZeroTierUI.pro
View file

@ -37,9 +37,9 @@ SOURCES += main.cpp\
../node/Topology.cpp \
../node/UdpSocket.cpp \
../node/Utils.cpp \
../ext/lz4/lz4.c \
../ext/lz4/lz4hc.c \
networkwidget.cpp
../ext/lz4/lz4.c \
../ext/lz4/lz4hc.c \
networkwidget.cpp
HEADERS += mainwindow.h \
aboutwindow.h \
@ -86,13 +86,13 @@ HEADERS += mainwindow.h \
../node/Thread.hpp \
../node/Topology.hpp \
../node/UdpSocket.hpp \
../ext/lz4/lz4.h \
../ext/lz4/lz4hc.h \
networkwidget.h
../ext/lz4/lz4.h \
../ext/lz4/lz4hc.h \
networkwidget.h
FORMS += mainwindow.ui \
aboutwindow.ui \
networkwidget.ui
networkwidget.ui
RESOURCES += \
resources.qrc

2
ZeroTierUI/helpers/mac/ZeroTier One (Authenticate).app/Contents/Info.plist
View file

@ -44,7 +44,7 @@
<key>positionOfDivider</key>
<real>333</real>
<key>savedFrame</key>
<string>36 164 602 597 0 0 1280 778 </string>
<string>239 124 602 597 0 0 1280 778 </string>
<key>selectedTabView</key>
<string>event log</string>
</dict>

BIN
ZeroTierUI/helpers/mac/ZeroTier One (Authenticate).app/Contents/Resources/Scripts/main.scpt
View file

Binary file not shown.

2
ZeroTierUI/helpers/mac/ZeroTier One (Install).app/Contents/Info.plist
View file

@ -42,7 +42,7 @@
<key>positionOfDivider</key>
<real>333</real>
<key>savedFrame</key>
<string>265 106 602 597 0 0 1280 778 </string>
<string>68 169 602 597 0 0 1280 778 </string>
<key>selectedTabView</key>
<string>event log</string>
</dict>

BIN
ZeroTierUI/helpers/mac/ZeroTier One (Install).app/Contents/Resources/Scripts/main.scpt
View file

Binary file not shown.

53
ZeroTierUI/mainwindow.cpp
View file

@ -23,6 +23,8 @@
#include <QScrollBar>
#include <QEventLoop>
QNetworkAccessManager *nam;
// Globally visible
ZeroTier::Node::LocalClient *zeroTierClient = (ZeroTier::Node::LocalClient *)0;
@ -51,7 +53,8 @@ static void handleZTMessage(void *arg,unsigned long id,const char *line)
MainWindow::MainWindow(QWidget *parent) :
QMainWindow(parent),
ui(new Ui::MainWindow)
ui(new Ui::MainWindow),
nam(new QNetworkAccessManager(this))
{
ui->setupUi(this);
this->startTimer(1000); // poll service every second
@ -59,6 +62,8 @@ MainWindow::MainWindow(QWidget *parent) :
mainWindow = this;
this->cyclesSinceResponseFromService = 0;
QObject::connect(nam,SIGNAL(finished(QNetworkReply*)),this,SLOT(on_networkReply(QNetworkReply*)));
if (ui->networkListWidget->verticalScrollBar())
ui->networkListWidget->verticalScrollBar()->setSingleStep(8);
@ -79,30 +84,40 @@ void MainWindow::timerEvent(QTimerEvent *event)
{
event->accept();
#ifdef __APPLE__
#else
#endif
if (!zeroTierClient) {
std::string dotAuthFile((QDir::homePath() + QDir::separator() + ".zeroTierOneAuthToken").toStdString());
std::string authToken;
if (!ZeroTier::Utils::readFile(dotAuthFile.c_str(),authToken)) {
if (!ZeroTier::Utils::readFile(ZeroTier::Node::LocalClient::authTokenDefaultUserPath().c_str(),authToken)) {
#ifdef __APPLE__
// Run the little AppleScript hack that asks for admin credentials and
// then installs the auth token file in the current user's home.
QString authHelperPath(QCoreApplication::applicationDirPath() + "/../Resources/helpers/mac/ZeroTier One (Authenticate).app/Contents/MacOS/applet");
if (!QFile::exists(authHelperPath)) {
// Allow this to also work from the source tree if it's run from there.
// This is for debugging purposes and shouldn't harm the live release
// in any way.
authHelperPath = QCoreApplication::applicationDirPath() + "/../../../../ZeroTierUI/helpers/mac/ZeroTier One (Authenticate).app/Contents/MacOS/applet";
if (QFile::exists("/Library/Application Support/ZeroTier/One/zerotier-one")) {
// Run the little AppleScript hack that asks for admin credentials and
// then installs the auth token file in the current user's home.
QString authHelperPath(QCoreApplication::applicationDirPath() + "/../Resources/helpers/mac/ZeroTier One (Authenticate).app/Contents/MacOS/applet");
if (!QFile::exists(authHelperPath)) {
QMessageBox::critical(this,"Unable to Locate Helper","Unable to locate authorization helper, cannot obtain authentication token.",QMessageBox::Ok,QMessageBox::NoButton);
// Allow this to also work from the source tree if it's run from there.
// This is for debugging purposes and shouldn't harm the live release
// in any way.
authHelperPath = QCoreApplication::applicationDirPath() + "/../../../../ZeroTierUI/helpers/mac/ZeroTier One (Authenticate).app/Contents/MacOS/applet";
if (!QFile::exists(authHelperPath)) {
QMessageBox::critical(this,"Unable to Locate Helper","Unable to locate authorization helper, cannot obtain authentication token.",QMessageBox::Ok,QMessageBox::NoButton);
QApplication::exit(1);
return;
}
}
QProcess::execute(authHelperPath,QStringList());
} else {
// Download the latest version and install it
this->setEnabled(false);
// Run the little AppleScript hack that asks for admin credentials and
// then installs the auth token file in the current user's home.
QString installHelperPath(QCoreApplication::applicationDirPath() + "/../Resources/helpers/mac/ZeroTier One (Install).app/Contents/MacOS/applet");
if (!QFile::exists(installHelperPath)) {
QMessageBox::critical(this,"Unable to Locate Helper","Unable to locate install helper, cannot install service.",QMessageBox::Ok,QMessageBox::NoButton);
QApplication::exit(1);
return;
}
QProcess::execute(installHelperPath,QStringList());
}
QProcess::execute(authHelperPath,QStringList());
#endif
if (!ZeroTier::Utils::readFile(dotAuthFile.c_str(),authToken)) {
@ -291,3 +306,7 @@ void MainWindow::on_addressButton_clicked()
{
QApplication::clipboard()->setText(this->myAddress);
}
void MainWindow::on_networkReply(QNetworkReply *reply)
{
}

6
ZeroTierUI/mainwindow.h
View file

@ -4,6 +4,10 @@
#include <QMainWindow>
#include <QEvent>
#include <QString>
#include <QNetworkAccessManager>
#include <QUrl>
#include <QNetworkRequest>
#include <QNetworkReply>
#include <map>
#include <vector>
@ -51,10 +55,12 @@ private slots:
void on_actionAbout_triggered();
void on_networkIdLineEdit_textChanged(const QString &text);
void on_addressButton_clicked();
void on_networkReply(QNetworkReply *reply);
private:
Ui::MainWindow *ui;
QNetworkAccessManager *nam;
QString myAddress;
QString myStatus;
QString myVersion;