xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remote: stricter validation of the session names

Browse Source 
Creating a session will not accept any slashes in the session path,
connecting to an existing session will accept at most one slash to
allow for specifying the session of a different user.

Fixes #1635
This commit is contained in:
Maxime Coste 2017-11-04 12:01:25 +08:00
parent aa9bcf08fc
commit aa82a90c39
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/remote.cc
View File

@ -531,7 +531,10 @@ static sockaddr_un session_addr(StringView session)
{ {
sockaddr_un addr; sockaddr_un addr;
addr.sun_family = AF_UNIX; addr.sun_family = AF_UNIX;
if (find(session, '/')!= session.end()) auto slash_count = std::count(session.begin(), session.end(), '/');
if (slash_count > 1)
throw runtime_error{"Session names are either <user>/<name> or <name>"};
else if (slash_count == 1)
format_to(addr.sun_path, "{}/kakoune/{}", tmpdir(), session); format_to(addr.sun_path, "{}/kakoune/{}", tmpdir(), session);
else else
format_to(addr.sun_path, "{}/kakoune/{}/{}", tmpdir(), format_to(addr.sun_path, "{}/kakoune/{}/{}", tmpdir(),
@ -766,6 +769,9 @@ private:
Server::Server(String session_name) Server::Server(String session_name)
: m_session{std::move(session_name)} : m_session{std::move(session_name)}
{ {
if (contains(m_session, '/'))
throw runtime_error{"Cannot create sessions with '/' in their name"};
int listen_sock = socket(AF_UNIX, SOCK_STREAM, 0); int listen_sock = socket(AF_UNIX, SOCK_STREAM, 0);
fcntl(listen_sock, F_SETFD, FD_CLOEXEC); fcntl(listen_sock, F_SETFD, FD_CLOEXEC);
sockaddr_un addr = session_addr(m_session); sockaddr_un addr = session_addr(m_session);