make HTTP user agent configurable

Author: lilydjwg

config.toml.sample

@@ -21,6 +21,8 @@ name = "lilac"
 email = "lilac@example.com"
 # for internal error reports
 master = "Your Name <youremail@example.com>"
+# the user_agent to use for fetching HTTP resources
+# user_agent = "lilac/0.3 (URL; email)"
 # Set and unsubscribe_address to receive unsubscribe requests
 # unsubscribe_address = "unsubscribe@example.com"
 # Set to yes to automatically rebuild packages which failed to build last time

lilac2/api.py

@@ -37,13 +37,11 @@
 logger = logging.getLogger(__name__)
 
 _g = SimpleNamespace()
-UserAgent = 'lilac/0.2b (package auto-build bot, by lilydjwg)'
 
 logging.getLogger('httpcore').setLevel(logging.ERROR)
 logging.getLogger('hpack').setLevel(logging.ERROR)
 
 s = httpx.Client(http2=True)
-s.headers['User-Agent'] = UserAgent
 
 VCS_SUFFIXES = ('-git', '-hg', '-svn', '-bzr')
 AUR_BLACKLIST = {

lilac2/building.py

@@ -214,6 +214,9 @@ def call_worker(
     'deadline': deadline,
     'reponame': repo.name,
   }
+  if ua := repo.user_agent:
+    input['user_agent'] = ua
+
   fd, resultpath = tempfile.mkstemp(prefix=f'{pkgbase}-', suffix='.lilac')
   os.close(fd)
   input['result'] = resultpath

lilac2/repo.py

@@ -42,6 +42,7 @@ def __init__(self, config: dict[str, Any]) -> None:
     self.name = config['repository']['name']
     self.trim_ansi_codes = not config['smtp'].get('use_ansi', False)
     self.commit_msg_prefix = config['lilac'].get('commit_msg_prefix', '')
+    self.user_agent = config['lilac'].get('user_agent')
 
     self.repodir = Path(config['repository']['repodir']).expanduser()
     self.bindmounts = config.get('bindmounts', [])

lilac2/worker.py

@@ -224,6 +224,9 @@ def main() -> None:
   reports: list[Report] = []
   _G.add_report = partial(add_report, reports)
 
+  if ua := input.get('user_agent'):
+    api.s.headers['User-Agent'] = ua
+
   r: dict[str, Any]
   try:
     with load_lilac(Path('.')) as mod: