X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=autorandr.py;h=548f3129767ab32b52b561dc4f0f2fd6ab4bfd79;hb=76845107ddab50041053d5e05b7a006a7c58a276;hp=dbcf8753d2d08bf16f93aa425abc38936b53e064;hpb=9e93a611cc00e5cbeddc9d8a7cb5bc93f111a060;p=deb_pkgs%2Fautorandr.git diff --git a/autorandr.py b/autorandr.py index dbcf875..548f312 100755 --- a/autorandr.py +++ b/autorandr.py @@ -30,16 +30,22 @@ import getopt import hashlib import os import posix +import pwd import re import subprocess import sys import shutil +import time from collections import OrderedDict from distutils.version import LooseVersion as Version from functools import reduce from itertools import chain +try: + input = raw_input +except NameError: + pass virtual_profiles = [ # (name, description, callback) @@ -64,6 +70,7 @@ Usage: autorandr [options] --config dump your current xrandr setup --dry-run don't change anything, only print the xrandr commands --debug enable verbose output +--batch run autorandr for all users with active X11 sessions To prevent a profile from being loaded, place a script call "block" in its directory. The script is evaluated before the screen setup is inspected, and @@ -108,7 +115,8 @@ class AutorandrException(Exception): retval.append(":\n ") retval.append(str(self.original_exception).replace("\n", "\n ")) if self.report_bug: - retval.append("\nThis appears to be a bug. Please help improving autorandr by reporting it upstream." + retval.append("\nThis appears to be a bug. Please help improving autorandr by reporting it upstream:" + "\nhttps://github.com/phillipberndt/autorandr/issues" "\nPlease attach the output of `xrandr --verbose` to your bug report if appropriate.") return "".join(retval) @@ -524,6 +532,25 @@ def update_mtime(filename): except: return False +def call_and_retry(*args, **kwargs): + """Wrapper around subprocess.call that retries failed calls. + + This function calls subprocess.call and on non-zero exit states, + waits a second and then retries once. This mitigates #47, + a timing issue with some drivers. + """ + kwargs_redirected = dict(kwargs) + if hasattr(subprocess, "DEVNULL"): + kwargs_redirected["stdout"] = getattr(subprocess, "DEVNULL") + else: + kwargs_redirected["stdout"] = open(os.devnull, "w") + kwargs_redirected["stderr"] = kwargs_redirected["stdout"] + retval = subprocess.call(*args, **kwargs_redirected) + if retval != 0: + time.sleep(1) + retval = subprocess.call(*args, **kwargs) + return retval + def apply_configuration(new_configuration, current_configuration, dry_run=False): "Apply a configuration" outputs = sorted(new_configuration.keys(), key=lambda x: new_configuration[x].sort_key) @@ -577,13 +604,13 @@ def apply_configuration(new_configuration, current_configuration, dry_run=False) # Perform pe-change auxiliary changes if auxiliary_changes_pre: argv = base_argv + list(chain.from_iterable(auxiliary_changes_pre)) - if subprocess.call(argv) != 0: + if call_and_retry(argv) != 0: raise AutorandrException("Command failed: %s" % " ".join(argv)) # Disable unused outputs, but make sure that there always is at least one active screen disable_keep = 0 if remain_active_count else 1 if len(disable_outputs) > disable_keep: - if subprocess.call(base_argv + list(chain.from_iterable(disable_outputs[:-1] if disable_keep else disable_outputs))) != 0: + if call_and_retry(base_argv + list(chain.from_iterable(disable_outputs[:-1] if disable_keep else disable_outputs))) != 0: # Disabling the outputs failed. Retry with the next command: # Sometimes disabling of outputs fails due to an invalid RRSetScreenSize. # This does not occur if simultaneously the primary screen is reset. @@ -602,7 +629,7 @@ def apply_configuration(new_configuration, current_configuration, dry_run=False) operations = disable_outputs + enable_outputs for index in range(0, len(operations), 2): argv = base_argv + list(chain.from_iterable(operations[index:index+2])) - if subprocess.call(argv) != 0: + if call_and_retry(argv) != 0: raise AutorandrException("Command failed: %s" % " ".join(argv)) def is_equal_configuration(source_configuration, target_configuration): @@ -711,7 +738,7 @@ def exec_scripts(profile_path, script_name, meta_information=None): user_profile_path = os.path.join(os.environ.get("XDG_CONFIG_HOME", os.path.expanduser("~/.config")), "autorandr") for folder in chain((profile_path, os.path.dirname(profile_path), user_profile_path), - (os.path.join(x, "autorandr") for x in os.environ.get("XDG_CONFIG_DIRS", "").split(":"))): + (os.path.join(x, "autorandr") for x in os.environ.get("XDG_CONFIG_DIRS", "/etc/xdg").split(":"))): if script_name not in ran_scripts: script = os.path.join(folder, script_name) @@ -731,20 +758,95 @@ def exec_scripts(profile_path, script_name, meta_information=None): return all_ok +def dispatch_call_to_sessions(argv): + """Invoke autorandr for each open local X11 session with the given options. + + The function iterates over all processes not owned by root and checks + whether they have a DISPLAY variable set. It strips the screen from any + variable it finds (i.e. :0.0 becomes :0) and checks whether this display + has been handled already. If it has not, it forks, changes uid/gid to + the user owning the process, reuses the process's environment and runs + autorandr with the parameters from argv. + + This function requires root permissions. It only works for X11 servers that + have at least one non-root process running. It is susceptible for attacks + where one user runs a process with another user's DISPLAY variable - in + this case, it might happen that autorandr is invoked for the other user, + which won't work. Since no other harm than prevention of automated + execution of autorandr can be done this way, the assumption is that in this + situation, the local administrator will handle the situation.""" + X11_displays_done = set() + + autorandr_binary = os.path.abspath(argv[0]) + + for directory in os.listdir("/proc"): + directory = os.path.join("/proc/", directory) + if not os.path.isdir(directory): + continue + environ_file = os.path.join(directory, "environ") + if not os.path.isfile(environ_file): + continue + uid = os.stat(environ_file).st_uid + if uid == 0: + continue + + process_environ = {} + for environ_entry in open(environ_file).read().split("\0"): + if "=" in environ_entry: + name, value = environ_entry.split("=", 1) + if name == "DISPLAY" and "." in value: + value = value[:value.find(".")] + process_environ[name] = value + display = process_environ["DISPLAY"] if "DISPLAY" in process_environ else None + + if display and display not in X11_displays_done: + try: + pwent = pwd.getpwuid(uid) + except KeyError: + # User has no pwd entry + continue + + print("Running autorandr as %s for display %s" % (pwent.pw_name, display)) + child_pid = os.fork() + if child_pid == 0: + # This will throw an exception if any of the privilege changes fails, + # so it should be safe. Also, note that since the environment + # is taken from a process owned by the user, reusing it should + # not leak any information. + os.setgroups([]) + os.setresgid(pwent.pw_gid, pwent.pw_gid, pwent.pw_gid) + os.setresuid(pwent.pw_uid, pwent.pw_uid, pwent.pw_uid) + os.chdir(pwent.pw_dir) + os.environ.clear() + os.environ.update(process_environ) + os.execl(autorandr_binary, autorandr_binary, *argv[1:]) + os.exit(1) + os.waitpid(child_pid, 0) + + X11_displays_done.add(display) + def main(argv): try: - options = dict(getopt.getopt(argv[1:], "s:r:l:d:cfh", [ "dry-run", "change", "default=", "save=", "remove=", "load=", "force", "fingerprint", "config", "debug", "skip-options=", "help" ])[0]) + options = dict(getopt.getopt(argv[1:], "s:r:l:d:cfh", [ "batch", "dry-run", "change", "default=", "save=", "remove=", "load=", "force", "fingerprint", "config", "debug", "skip-options=", "help" ])[0]) except getopt.GetoptError as e: print("Failed to parse options: {0}.\n" "Use --help to get usage information.".format(str(e)), file=sys.stderr) sys.exit(posix.EX_USAGE) + # Batch mode + if "--batch" in options: + if ("DISPLAY" not in os.environ or not os.environ["DISPLAY"]) and os.getuid() == 0: + dispatch_call_to_sessions([ x for x in argv if x != "--batch" ]) + else: + print("--batch mode can only be used by root and if $DISPLAY is unset") + return + profiles = {} try: # Load profiles from each XDG config directory # The XDG spec says that earlier entries should take precedence, so reverse the order - for directory in reversed(os.environ.get("XDG_CONFIG_DIRS", "").split(":")): + for directory in reversed(os.environ.get("XDG_CONFIG_DIRS", "/etc/xdg").split(":")): system_profile_path = os.path.join(directory, "autorandr") if os.path.isdir(system_profile_path): profiles.update(load_profiles(system_profile_path)) @@ -801,11 +903,23 @@ def main(argv): if options["--remove"] not in profiles.keys(): raise AutorandrException("Cannot remove profile '%s':\nThis profile does not exist." % options["--remove"]) try: + remove = True profile_folder = os.path.join(profile_path, options["--remove"]) - shutil.rmtree(profile_folder) + profile_dirlist = os.listdir(profile_folder) + profile_dirlist.remove("config") + profile_dirlist.remove("setup") + if profile_dirlist: + print("Profile folder '%s' contains the following additional files:\n---\n%s\n---" % (options["--remove"], "\n".join(profile_dirlist))) + response = input("Do you really want to remove profile '%s'? If so, type 'yes': " % options["--remove"]).strip() + if response != "yes": + remove = False + if remove is True: + shutil.rmtree(profile_folder) + print("Removed profile '%s'" % options["--remove"]) + else: + print("Profile '%s' was not removed" % options["--remove"]) except Exception as e: raise AutorandrException("Failed to remove profile '%s'" % (options["--remove"],), e) - print("Removed profile '%s'" % options["--remove"]) sys.exit(0) if "-h" in options or "--help" in options: @@ -882,6 +996,9 @@ def main(argv): "PROFILE_FOLDER": scripts_path, } exec_scripts(scripts_path, "preswitch", script_metadata) + if "--debug" in options: + print("Going to run:") + apply_configuration(load_config, config, True) apply_configuration(load_config, config, False) exec_scripts(scripts_path, "postswitch", script_metadata) except Exception as e: @@ -906,5 +1023,5 @@ if __name__ == '__main__': print("Exception: {0}".format(e.__class__.__name__)) sys.exit(2) - print("Unhandled exception ({0}). Please report this as a bug.".format(e), file=sys.stderr) + print("Unhandled exception ({0}). Please report this as a bug at https://github.com/phillipberndt/autorandr/issues.".format(e), file=sys.stderr) raise