mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-22 06:15:58 +00:00
fix(desktop): let desktop apps save read-only game files, and make game libraries writable (#1781)
This commit is contained in:
1 parent
5786e89ff4
commit
22d39998f0
8 files changed
+366
-4
No files matched your search
@@ -44,6 +44,7 @@ python3 /usr/local/bin/droiddeck-pad-defaults 2>&1 | sed 's/^/[pads] /'
|
||||
( while sleep 30; do python3 /usr/local/bin/droiddeck-pad-defaults 2>&1 | sed 's/^/[pads] /'; done ) &
|
||||
python3 /usr/local/bin/droiddeck-desktop-gpu 2>&1 | sed 's/^/[gpu] /'
|
||||
/usr/local/bin/droiddeck-desktop-window-rules 2>&1 | sed 's/^/[rules] /'
|
||||
( python3 /usr/local/bin/droiddeck-library-perms 2>&1 | sed 's/^/[perms] /' ) &
|
||||
mkdir -p /usr/local/share/applications
|
||||
cat > /usr/local/share/applications/droiddeck-ime.desktop <<'ENTRY'
|
||||
[Desktop Entry]
|
||||
|
||||
@@ -0,0 +1,93 @@
|
||||
#!/usr/bin/python3
|
||||
import os
|
||||
import re
|
||||
import stat
|
||||
import sys
|
||||
|
||||
HOME = os.environ.get("HOME", "/root")
|
||||
STEAM = os.path.join(HOME, ".local/share/Steam")
|
||||
STORES = os.environ.get("DROIDDECK_STORES_ROOT", "/mnt/droiddeck-stores")
|
||||
TOOLS = re.compile(r"^(Proton |Proton$|SteamLinuxRuntime|Steamworks Shared$)")
|
||||
|
||||
|
||||
def libraries():
|
||||
paths = [STEAM]
|
||||
try:
|
||||
with open(os.path.join(STEAM, "steamapps/libraryfolders.vdf"), encoding="utf-8", errors="replace") as f:
|
||||
paths += [p.replace("\\\\", "\\") for p in re.findall(r'"path"\s+"([^"]+)"', f.read())]
|
||||
except OSError:
|
||||
pass
|
||||
seen = []
|
||||
for path in paths:
|
||||
real = os.path.realpath(path)
|
||||
if real not in seen:
|
||||
seen.append(real)
|
||||
return seen
|
||||
|
||||
|
||||
def roots():
|
||||
found = []
|
||||
for library in libraries():
|
||||
for name in ("common", "compatdata"):
|
||||
found.append((os.path.join(library, "steamapps", name), name == "common"))
|
||||
found.append((os.path.join(HOME, "Games"), False))
|
||||
try:
|
||||
found += [(entry.path, False) for entry in os.scandir(STORES) if entry.is_dir(follow_symlinks=False)]
|
||||
except OSError:
|
||||
pass
|
||||
return [(path, skip_tools) for path, skip_tools in found if os.path.isdir(path)]
|
||||
|
||||
|
||||
def fix(path, st, wanted):
|
||||
if st.st_uid != os.geteuid() or st.st_mode & wanted == wanted:
|
||||
return 0
|
||||
try:
|
||||
os.chmod(path, stat.S_IMODE(st.st_mode) | wanted)
|
||||
return 1
|
||||
except OSError:
|
||||
return 0
|
||||
|
||||
|
||||
def walk(top, skip_tools):
|
||||
fixed = 0
|
||||
stack = [(top, True)]
|
||||
while stack:
|
||||
directory, first = stack.pop()
|
||||
try:
|
||||
entries = list(os.scandir(directory))
|
||||
except OSError:
|
||||
continue
|
||||
for entry in entries:
|
||||
if first and skip_tools and TOOLS.match(entry.name):
|
||||
continue
|
||||
try:
|
||||
st = entry.stat(follow_symlinks=False)
|
||||
except OSError:
|
||||
continue
|
||||
if stat.S_ISDIR(st.st_mode):
|
||||
fixed += fix(entry.path, st, stat.S_IRWXU)
|
||||
stack.append((entry.path, False))
|
||||
elif stat.S_ISREG(st.st_mode):
|
||||
fixed += fix(entry.path, st, stat.S_IRUSR | stat.S_IWUSR)
|
||||
return fixed
|
||||
|
||||
|
||||
def main():
|
||||
try:
|
||||
os.nice(19)
|
||||
except OSError:
|
||||
pass
|
||||
total = 0
|
||||
for top, skip_tools in roots():
|
||||
try:
|
||||
fixed = fix(top, os.stat(top), stat.S_IRWXU) + walk(top, skip_tools)
|
||||
except OSError:
|
||||
continue
|
||||
if fixed:
|
||||
print(f"droiddeck-library-perms: {top}: {fixed} made writable")
|
||||
total += fixed
|
||||
print(f"droiddeck-library-perms: {total} files and folders made writable")
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
sys.exit(main())
|
||||
@@ -139,17 +139,31 @@ static int (*next_faccessat(void))(int, const char *, int, int) {
|
||||
}
|
||||
|
||||
__attribute__((visibility("hidden"))) int bl_binfmt_runnable(const char *path, int mode);
|
||||
__attribute__((visibility("hidden"))) int bl_writable_access(int dirfd, const char *path, int mode, int flags);
|
||||
|
||||
static int writable_as_owner(int (*real)(int, const char *, int, int), int dirfd, const char *path, int mode, int flags) {
|
||||
if (!bl_writable_access(dirfd, path, mode, flags)) return -1;
|
||||
if ((mode & ~W_OK) == 0 || real(dirfd, path, mode & ~W_OK, flags) == 0) return 0;
|
||||
return -1;
|
||||
}
|
||||
|
||||
static int check_cwd(const char *path, int mode, int flags) {
|
||||
int (*real)(int, const char *, int, int) = next_faccessat();
|
||||
int result;
|
||||
int err;
|
||||
|
||||
if (real == NULL) {
|
||||
errno = ENOSYS;
|
||||
return -1;
|
||||
}
|
||||
result = real(AT_FDCWD, path, mode, flags);
|
||||
return result != 0 && errno == EACCES && bl_binfmt_runnable(path, mode) ? 0 : result;
|
||||
if (result == 0) return 0;
|
||||
err = errno;
|
||||
if (err == EACCES && bl_binfmt_runnable(path, mode)) return 0;
|
||||
errno = err;
|
||||
if (writable_as_owner(real, AT_FDCWD, path, mode, flags) == 0) return 0;
|
||||
errno = err;
|
||||
return result;
|
||||
}
|
||||
|
||||
int access(const char *path, int mode) {
|
||||
@@ -166,6 +180,7 @@ int eaccess(const char *path, int mode) {
|
||||
|
||||
int faccessat(int dirfd, const char *path, int mode, int flags) {
|
||||
int (*real)(int, const char *, int, int);
|
||||
int err;
|
||||
|
||||
if (dirfd == AT_FDCWD) {
|
||||
return cached_access(path, mode, flags, check_cwd);
|
||||
@@ -175,5 +190,9 @@ int faccessat(int dirfd, const char *path, int mode, int flags) {
|
||||
errno = ENOSYS;
|
||||
return -1;
|
||||
}
|
||||
return real(dirfd, path, mode, flags);
|
||||
if (real(dirfd, path, mode, flags) == 0) return 0;
|
||||
err = errno;
|
||||
if (writable_as_owner(real, dirfd, path, mode, flags) == 0) return 0;
|
||||
errno = err;
|
||||
return -1;
|
||||
}
|
||||
@@ -3,6 +3,7 @@
|
||||
#include <fcntl.h>
|
||||
#include <limits.h>
|
||||
#include <string.h>
|
||||
#include <strings.h>
|
||||
#include <sys/stat.h>
|
||||
#include <unistd.h>
|
||||
|
||||
@@ -23,6 +24,34 @@ static int is_steam_client(void) {
|
||||
return cached;
|
||||
}
|
||||
|
||||
static int wine_name(const char *path) {
|
||||
const char *base;
|
||||
size_t n;
|
||||
|
||||
if (path == NULL) return 0;
|
||||
base = strrchr(path, '/');
|
||||
base = base ? base + 1 : path;
|
||||
n = strlen(path);
|
||||
return strncmp(base, "wine", 4) == 0 || strstr(path, "/lib/wine/") != NULL
|
||||
|| (n > 4 && strcasecmp(path + n - 4, ".exe") == 0);
|
||||
}
|
||||
|
||||
static int is_wine(void) {
|
||||
static int cached = -1;
|
||||
char exe[PATH_MAX];
|
||||
ssize_t n;
|
||||
|
||||
if (cached >= 0) return cached;
|
||||
n = readlink("/proc/self/exe", exe, sizeof(exe) - 1);
|
||||
if (n > 0) exe[n] = '\0';
|
||||
cached = (n > 0 && wine_name(exe)) || wine_name(program_invocation_name);
|
||||
return cached;
|
||||
}
|
||||
|
||||
static int acts_as_root(void) {
|
||||
return is_steam_client() || !is_wine();
|
||||
}
|
||||
|
||||
static int grant_owner_write(int dirfd, const char *path) {
|
||||
struct stat st;
|
||||
|
||||
@@ -37,7 +66,7 @@ int bl_writable_retry(int dirfd, const char *path, int flags) {
|
||||
char parent[PATH_MAX];
|
||||
const char *slash;
|
||||
|
||||
if (saved != EACCES || path == NULL || (flags & O_ACCMODE) == O_RDONLY || !is_steam_client()) return 0;
|
||||
if (saved != EACCES || path == NULL || (flags & O_ACCMODE) == O_RDONLY || !acts_as_root()) return 0;
|
||||
if (faccessat(dirfd, path, F_OK, 0) == 0) {
|
||||
granted = grant_owner_write(dirfd, path);
|
||||
} else if (flags & O_CREAT) {
|
||||
@@ -53,3 +82,15 @@ int bl_writable_retry(int dirfd, const char *path, int flags) {
|
||||
errno = saved;
|
||||
return granted;
|
||||
}
|
||||
|
||||
__attribute__((visibility("hidden")))
|
||||
int bl_writable_access(int dirfd, const char *path, int mode, int flags) {
|
||||
int saved = errno;
|
||||
struct stat st;
|
||||
int owned;
|
||||
|
||||
if (saved != EACCES || path == NULL || !(mode & W_OK) || !acts_as_root()) return 0;
|
||||
owned = fstatat(dirfd, path, &st, flags & AT_SYMLINK_NOFOLLOW) == 0 && st.st_uid == geteuid();
|
||||
errno = saved;
|
||||
return owned;
|
||||
}
|
||||
Reference in new issue
Block a user