VERSION 0.6.10: Windows runs again!

Not a significant release for OSS users, but this version marks a significant
increase in workitude on the Windows platform. A properly and officially
signed x64 driver is also included. x86 drivers and more Windows work including
Qt UI are coming soon.

.gitignore

@@ -9,19 +9,13 @@
 /netconf-service/netconf-test
 /netconf-service/netconf.service
 /ipch
-/ZeroTierOne.sdf
-/ZeroTierOne.v11.suo
-/vsprojects/SelfTest/Debug
-/vsprojects/SelfTest/Release
-/vsprojects/ZeroTierOne/Debug
-/vsprojects/ZeroTierOne/Release
-/vsprojects/ZeroTierOne/x64
-/vsprojects/TapDriver/Win32
-/vsprojects/TapDriver/x64
-/vsprojects/InstallerUpdater/obj
-/vsprojects/Service/obj
-/vsprojects/SelfTest/SelfTest.aps
-/Build/*
+/windows/ZeroTierOne.sdf
+/windows/ZeroTierOne.v11.suo
+/windows/*/x64
+/windows/*/Win32
+/windows/ZeroTierOneService/obj
+/windows/ZeroTierOneService/bin
+/windows/Build
 *.log
 *.opensdf
 *.user
@@ -32,3 +26,6 @@
 /ZeroTierOneInstaller-*
 .qmake.stash
 *.autosave
+/ZeroTier One.zip
+/ZeroTier One.dmg
+/windows/x64

ZeroTierUI/ZeroTierUI.pro

@@ -3,9 +3,11 @@ TARGET = "ZeroTier One"
 TEMPLATE = app
 
 win32:RC_FILE = ZeroTierUI.rc
+
 mac:ICON = zt1icon.icns
 mac:QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6
 mac:QMAKE_INFO_PLIST = Info.plist
+mac:LIBS += -framework Cocoa
 
 SOURCES += main.cpp\
 				mainwindow.cpp \
@@ -40,7 +42,8 @@ SOURCES += main.cpp\
 		../ext/lz4/lz4.c \
 		../ext/lz4/lz4hc.c \
 		networkwidget.cpp \
-    installdialog.cpp
+		installdialog.cpp \
+    licensedialog.cpp
 
 HEADERS  += mainwindow.h \
 		aboutwindow.h \
@@ -90,12 +93,22 @@ HEADERS  += mainwindow.h \
 		../ext/lz4/lz4.h \
 		../ext/lz4/lz4hc.h \
 		networkwidget.h \
-    installdialog.h
+		installdialog.h \
+		mac_doprivileged.h \
+    licensedialog.h \
+    main.h
 
 FORMS    += mainwindow.ui \
 		aboutwindow.ui \
 		networkwidget.ui \
-    installdialog.ui
+		installdialog.ui \
+    licensedialog.ui
 
 RESOURCES += \
 		resources.qrc
+
+mac:OBJECTIVE_SOURCES += \
+		mac_doprivileged.mm
+
+OTHER_FILES += \
+    stylesheet.css

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

@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleAllowMixedLocalizations</key>
-	<true/>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleExecutable</key>
-	<string>applet</string>
-	<key>CFBundleIconFile</key>
-	<string>applet</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.zerotier.one.ZeroTierOneMacAuthenticateScript</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>ZeroTier One (Authenticate)</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleSignature</key>
-	<string>aplt</string>
-	<key>CFBundleVersion</key>
-	<string>1</string>
-	<key>LSMinimumSystemVersionByArchitecture</key>
-	<dict>
-		<key>x86_64</key>
-		<string>10.6</string>
-	</dict>
-	<key>LSRequiresCarbon</key>
-	<true/>
-	<key>NSHumanReadableCopyright</key>
-	<string>(c) 2013-2014 ZeroTier Networks LLC</string>
-	<key>WindowState</key>
-	<dict>
-		<key>dividerCollapsed</key>
-		<false/>
-		<key>eventLogLevel</key>
-		<integer>-1</integer>
-		<key>name</key>
-		<string>ScriptWindowState</string>
-		<key>positionOfDivider</key>
-		<real>333</real>
-		<key>savedFrame</key>
-		<string>239 124 602 597 0 0 1280 778 </string>
-		<key>selectedTabView</key>
-		<string>event log</string>
-	</dict>
-</dict>
-</plist>

ZeroTierUI/helpers/mac/ZeroTier One (Authenticate).app/Contents/PkgInfo

@@ -1 +0,0 @@
-APPLaplt

ZeroTierUI/helpers/mac/ZeroTier One (Authenticate).app/Contents/Resources/description.rtfd/TXT.rtf

@@ -1,4 +0,0 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1265
-{\fonttbl}
-{\colortbl;\red255\green255\blue255;}
-}

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

@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleAllowMixedLocalizations</key>
-	<true/>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleExecutable</key>
-	<string>applet</string>
-	<key>CFBundleIconFile</key>
-	<string>applet</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.zerotier.one.ZeroTierOneMacInstallScript</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>ZeroTier One (Authenticate)</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleSignature</key>
-	<string>aplt</string>
-	<key>LSMinimumSystemVersionByArchitecture</key>
-	<dict>
-		<key>x86_64</key>
-		<string>10.6</string>
-	</dict>
-	<key>LSRequiresCarbon</key>
-	<true/>
-	<key>NSHumanReadableCopyright</key>
-	<string>(c) 2013 ZeroTier Networks LLC</string>
-	<key>WindowState</key>
-	<dict>
-		<key>dividerCollapsed</key>
-		<false/>
-		<key>eventLogLevel</key>
-		<integer>-1</integer>
-		<key>name</key>
-		<string>ScriptWindowState</string>
-		<key>positionOfDivider</key>
-		<real>333</real>
-		<key>savedFrame</key>
-		<string>350 166 602 597 0 0 1920 1058 </string>
-		<key>selectedTabView</key>
-		<string>event log</string>
-	</dict>
-</dict>
-</plist>

ZeroTierUI/helpers/mac/ZeroTier One (Install).app/Contents/PkgInfo

@@ -1 +0,0 @@
-APPLaplt

ZeroTierUI/helpers/mac/ZeroTier One (Install).app/Contents/Resources/description.rtfd/TXT.rtf

@@ -1,4 +0,0 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1265
-{\fonttbl}
-{\colortbl;\red255\green255\blue255;}
-}

ZeroTierUI/installdialog.cpp

@@ -38,9 +38,14 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/stat.h>
+#include <sys/types.h>
 #include <fcntl.h>
 #endif
 
+#ifdef __APPLE__
+#include "mac_doprivileged.h"
+#endif
+
 #include <QMainWindow>
 #include <QMessageBox>
 #include <QByteArray>
@@ -50,7 +55,7 @@
 #include <QProcess>
 
 InstallDialog::InstallDialog(QWidget *parent) :
-	QDialog(parent),
+	QMainWindow(parent),
 	ui(new Ui::InstallDialog),
 	nam(new QNetworkAccessManager(this)),
 	phase(FETCHING_NFO)
@@ -103,45 +108,76 @@ void InstallDialog::on_networkReply(QNetworkReply *reply)
 				}	break;
 				case FETCHING_INSTALLER: {
 					if (!ZeroTier::SoftwareUpdater::validateUpdate(installerData.data(),installerData.length(),signedBy,signature)) {
-						QMessageBox::critical(this,"Download Failed","Download failed: there is a problem with the software update web site.\nTry agian later. (failed signature check)",QMessageBox::Ok,QMessageBox::NoButton);
+						QMessageBox::critical(this,"Download Failed","Download failed: there is a problem with the software update web site. Try agian later. (downloaded data failed signature check)",QMessageBox::Ok,QMessageBox::NoButton);
 						QApplication::exit(1);
 						return;
 					}
 
 #ifdef __APPLE__
-					QString zt1Caches(QDir::homePath() + "/Library/Caches/ZeroTier/One");
-					QDir::root().mkpath(zt1Caches);
-					QString instPath(zt1Caches+"/ZeroTierOneInstaller");
+					{
+						std::string homePath(QDir::homePath().toStdString());
+						QString zt1Caches(QDir::homePath() + "/Library/Caches/ZeroTier/One");
+						QDir::root().mkpath(zt1Caches);
+						std::string instPath((zt1Caches + "/ZeroTierOneInstaller").toStdString());
+						std::string tmpPath((zt1Caches + "/inst.sh").toStdString());
 
-					int outfd = ::open(instPath.toStdString().c_str(),O_CREAT|O_TRUNC|O_WRONLY,0755);
-					if (outfd <= 0) {
-						QMessageBox::critical(this,"Download Failed",QString("Installation failed: unable to write to ")+instPath,QMessageBox::Ok,QMessageBox::NoButton);
+						int outfd = ::open(instPath.c_str(),O_CREAT|O_TRUNC|O_WRONLY,0755);
+						if (outfd <= 0) {
+							QMessageBox::critical(this,"Download Failed",QString("Installation failed: unable to write to ")+instPath.c_str(),QMessageBox::Ok,QMessageBox::NoButton);
+							QApplication::exit(1);
+							return;
+						}
+						if (::write(outfd,installerData.data(),installerData.length()) != installerData.length()) {
+							QMessageBox::critical(this,"Installation Failed",QString("Installation failed: unable to write to ")+instPath.c_str(),QMessageBox::Ok,QMessageBox::NoButton);
+							QApplication::exit(1);
+							return;
+						}
+						::close(outfd);
+						chmod(instPath.c_str(),0755);
+
+						FILE *scr = fopen(tmpPath.c_str(),"w");
+						if (!scr) {
+							QMessageBox::critical(this,"Installation Failed","Cannot write script to temporary Library/Caches/ZeroTier/One folder.",QMessageBox::Ok,QMessageBox::NoButton);
+							QApplication::exit(1);
+							return;
+						}
+
+						fprintf(scr,"#!/bin/bash\n");
+						fprintf(scr,"export PATH=\"/bin:/usr/bin:/sbin:/usr/sbin\"\n");
+						fprintf(scr,"'%s'\n",instPath.c_str());
+						fprintf(scr,"if [ -f '/Library/Application Support/ZeroTier/One/authtoken.secret' ]; then\n");
+						fprintf(scr,"  mkdir -p '%s/Library/Application Support/ZeroTier/One'\n",homePath.c_str());
+						fprintf(scr,"  chown %d '%s/Library/Application Support/ZeroTier'\n",(int)getuid(),homePath.c_str());
+						fprintf(scr,"  chgrp %d '%s/Library/Application Support/ZeroTier'\n",(int)getgid(),homePath.c_str());
+						fprintf(scr,"  chmod 0700 '%s/Library/Application Support/ZeroTier'\n",homePath.c_str());
+						fprintf(scr,"  chown %d '%s/Library/Application Support/ZeroTier/One'\n",(int)getuid(),homePath.c_str());
+						fprintf(scr,"  chgrp %d '%s/Library/Application Support/ZeroTier/One'\n",(int)getgid(),homePath.c_str());
+						fprintf(scr,"  chmod 0700 '%s/Library/Application Support/ZeroTier/One'\n",homePath.c_str());
+						fprintf(scr,"  cp -f '/Library/Application Support/ZeroTier/One/authtoken.secret' '%s/Library/Application Support/ZeroTier/One/authtoken.secret'\n",homePath.c_str());
+						fprintf(scr,"  chown %d '%s/Library/Application Support/ZeroTier/One/authtoken.secret'\n",(int)getuid(),homePath.c_str());
+						fprintf(scr,"  chgrp %d '%s/Library/Application Support/ZeroTier/One/authtoken.secret'\n",(int)getgid(),homePath.c_str());
+						fprintf(scr,"  chmod 0600 '%s/Library/Application Support/ZeroTier/One/authtoken.secret'\n",homePath.c_str());
+						fprintf(scr,"fi\n");
+						fprintf(scr,"exit 0\n");
+
+						fclose(scr);
+						chmod(tmpPath.c_str(),0755);
+
+						macExecutePrivilegedShellCommand((std::string("'")+tmpPath+"' >>/dev/null 2>&1").c_str());
+
+						unlink(tmpPath.c_str());
+						unlink(instPath.c_str());
+
+						// Restart the binary with whatever updates may have occurred
+						std::string appPath(QCoreApplication::applicationFilePath().toStdString());
+						execl(appPath.c_str(),appPath.c_str(),(const char *)0);
+
+						// We only make it here if execl() fails
+						QMessageBox::critical(this,"Re-Launch Failed","An error occurred re-launching ZeroTier One.app. Try launching it manually.",QMessageBox::Ok,QMessageBox::NoButton);
 						QApplication::exit(1);
+
 						return;
 					}
-					if (::write(outfd,installerData.data(),installerData.length()) != installerData.length()) {
-						QMessageBox::critical(this,"Installation Failed",QString("Installation failed: unable to write to ")+instPath,QMessageBox::Ok,QMessageBox::NoButton);
-						QApplication::exit(1);
-						return;
-					}
-					::close(outfd);
-					::chmod(instPath.toStdString().c_str(),0755);
-
-					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;
-					}
-
-					// Terminate the GUI and execute the install helper instead
-					::execl(installHelperPath.toStdString().c_str(),installHelperPath.toStdString().c_str(),(const char *)0);
-
-					// We only make it here if execl() failed
-					QMessageBox::critical(this,"Unable to Locate Helper","Unable to locate install helper, cannot install service.",QMessageBox::Ok,QMessageBox::NoButton);
-					QApplication::exit(1);
-
-					return;
 #endif
 				}	break;
 			}

ZeroTierUI/installdialog.h

@@ -28,7 +28,7 @@
 #ifndef INSTALLDIALOG_H
 #define INSTALLDIALOG_H
 
-#include <QDialog>
+#include <QMainWindow>
 #include <QNetworkAccessManager>
 #include <QUrl>
 #include <QNetworkRequest>
@@ -42,7 +42,7 @@ namespace Ui {
 class InstallDialog;
 }
 
-class InstallDialog : public QDialog
+class InstallDialog : public QMainWindow
 {
 	Q_OBJECT
 

ZeroTierUI/installdialog.ui

@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>InstallDialog</class>
- <widget class="QDialog" name="InstallDialog">
-  <property name="windowModality">
-   <enum>Qt::ApplicationModal</enum>
-  </property>
+ <widget class="QMainWindow" name="InstallDialog">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -20,12 +17,7 @@
    <iconset resource="resources.qrc">
     <normaloff>:/img/zt1icon.png</normaloff>:/img/zt1icon.png</iconset>
   </property>
-  <property name="sizeGripEnabled">
-   <bool>true</bool>
-  </property>
-  <property name="modal">
-   <bool>true</bool>
-  </property>
+	<widget class="QWidget" name="centralWidget">
   <layout class="QVBoxLayout" name="verticalLayout">
    <property name="leftMargin">
     <number>6</number>
@@ -123,6 +115,7 @@ Please wait while the service downloads, then you will be prompted to enter an a
     </widget>
    </item>
   </layout>
+	</widget>
  </widget>
  <resources>
   <include location="resources.qrc"/>

ZeroTierUI/licensedialog.cpp

@@ -0,0 +1,31 @@
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "main.h"
+#include "licensedialog.h"
+#include "ui_licensedialog.h"
+
+LicenseDialog::LicenseDialog(QWidget *parent) :
+	QDialog(parent),
+	ui(new Ui::LicenseDialog)
+{
+	ui->setupUi(this);
+}
+
+LicenseDialog::~LicenseDialog()
+{
+	delete ui;
+}
+
+void LicenseDialog::on_buttonBox_accepted()
+{
+	settings->setValue("acceptedLicenseV1",true);
+	settings->sync();
+
+	this->setResult(QDialog::Accepted);
+}
+
+void LicenseDialog::on_buttonBox_rejected()
+{
+	::exit(0);
+}