mirror of
https://github.com/textmate/textmate.git
synced 2026-01-23 21:57:54 -05:00
49ae19c527
The recent move to 64 bit broke the (binary) protocol used between TextMate and the server for authenticated reads/writes (since size_t is now 64 bit). This fixes issue #354.
110 lines
2.7 KiB
C++
110 lines
2.7 KiB
C++
#include "server.h"
|
|
#include "constants.h"
|
|
#include <io/path.h>
|
|
#include <io/exec.h>
|
|
#include <regexp/regexp.h>
|
|
#include <OakSystem/application.h>
|
|
#include <oak/debug.h>
|
|
|
|
OAK_DEBUG_VAR(File_Auth);
|
|
|
|
static bool install_auth_tool (osx::authorization_t const& auth)
|
|
{
|
|
D(DBF_File_Auth, bug("\n"););
|
|
bool res = false;
|
|
|
|
std::string toolPath = oak::application_t::path("Contents/Resources/PrivilegedTool");
|
|
ASSERT(path::exists(toolPath));
|
|
|
|
if(auth.obtain_right("system.privilege.admin"))
|
|
{
|
|
char const* arguments[] = { "--install", NULL };
|
|
FILE* fp = NULL;
|
|
if(AuthorizationExecuteWithPrivileges(auth, toolPath.c_str(), kAuthorizationFlagDefaults, (char**)arguments, &fp) == errAuthorizationSuccess)
|
|
{
|
|
int status;
|
|
int pid = wait(&status);
|
|
if(pid != -1 && WIFEXITED(status) && WEXITSTATUS(status) == 0)
|
|
res = true;
|
|
else errno = WEXITSTATUS(status);
|
|
|
|
char buf[1024];
|
|
while(char* str = fgets(&buf[0], sizeof(buf), fp))
|
|
fprintf(stderr, "%s\n", str);
|
|
}
|
|
}
|
|
return res;
|
|
}
|
|
|
|
static double version_of_tool (std::string const& toolPath)
|
|
{
|
|
std::string res = io::exec(toolPath, "--version", NULL);
|
|
if(regexp::match_t const& m = regexp::search("\\A[^\\s]+ ([\\d.]+)", res.data(), res.data() + res.size()))
|
|
return strtod(res.c_str() + m.begin(1), NULL);
|
|
return 0;
|
|
}
|
|
|
|
static bool auth_server_too_old ()
|
|
{
|
|
if(path::exists(kAuthToolPath))
|
|
{
|
|
double oldVersion = version_of_tool(kAuthToolPath);
|
|
double newVersion = version_of_tool(oak::application_t::path("Contents/Resources/PrivilegedTool"));
|
|
return oldVersion < newVersion;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
connection_t connect_to_auth_server (osx::authorization_t const& auth, bool retry)
|
|
{
|
|
if(!path::exists(kAuthToolPath) || !path::exists(kAuthPlistPath) || auth_server_too_old())
|
|
{
|
|
if(!install_auth_tool(auth))
|
|
return connection_t();
|
|
}
|
|
|
|
if(auth.obtain_right(kAuthRightName))
|
|
{
|
|
int fd = socket(AF_UNIX, SOCK_STREAM, 0);
|
|
if(fd != -1)
|
|
{
|
|
struct sockaddr_un addr = { 0, AF_UNIX, kAuthSocketPath };
|
|
addr.sun_len = SUN_LEN(&addr);
|
|
|
|
if(connect(fd, (sockaddr*)&addr, sizeof(addr)) != -1)
|
|
{
|
|
connection_t res(fd);
|
|
std::string server;
|
|
int major, minor;
|
|
res >> server >> major >> minor;
|
|
D(DBF_File_Auth, bug("connected: %s %d.%d\n", server.c_str(), major, minor););
|
|
|
|
if(major != kAuthServerMajor)
|
|
{
|
|
D(DBF_File_Auth, bug("wrong version, wants %d.%d\n", kAuthServerMajor, kAuthServerMinor););
|
|
res << "quit" << "legacy" << "legacy" << "legacy";
|
|
|
|
if(retry || !install_auth_tool(auth))
|
|
return connection_t();
|
|
|
|
return connect_to_auth_server(auth, true);
|
|
}
|
|
|
|
res << "auth" << (std::string)auth;
|
|
return res;
|
|
}
|
|
else
|
|
{
|
|
perror("connect()");
|
|
}
|
|
|
|
close(fd);
|
|
}
|
|
else
|
|
{
|
|
perror("socket()");
|
|
}
|
|
}
|
|
return connection_t();
|
|
}
|