checkupdates: exit with error if fdroiddata git repo is dirty

[fdroidserver.git] / fdroidserver / checkupdates.py

diff --git a/fdroidserver/checkupdates.py b/fdroidserver/checkupdates.py
index 861324ab3ec349986167f7c5551e77a10f9b59f6..54b614ecc850c798c1c272aeffcf19a7dc8a5577 100644 (file)
--- a/fdroidserver/checkupdates.py
+++ b/fdroidserver/checkupdates.py
@@ -30,6 +30,7 @@ import html
 from distutils.version import LooseVersion
 import logging
 import copy
+import urllib.parse
 
 from . import _
 from . import common
@@ -48,6 +49,13 @@ def check_http(app):
             raise FDroidException('Missing Update Check Data')
 
         urlcode, codeex, urlver, verex = app.UpdateCheckData.split('|')
+        parsed = urllib.parse.urlparse(urlcode)
+        if not parsed.netloc or not parsed.scheme or parsed.scheme != 'https':
+            raise FDroidException(_('UpdateCheckData has invalid URL: {url}').format(url=urlcode))
+        if urlver != '.':
+            parsed = urllib.parse.urlparse(urlver)
+            if not parsed.netloc or not parsed.scheme or parsed.scheme != 'https':
+                raise FDroidException(_('UpdateCheckData has invalid URL: {url}').format(url=urlcode))
 
         vercode = "99999999"
         if len(urlcode) > 0:
@@ -421,6 +429,9 @@ def checkupdates_app(app):
         msg = 'Invalid update check method'
 
     if version and vercode and app.VercodeOperation:
+        if not common.VERCODE_OPERATION_RE.match(app.VercodeOperation):
+            raise MetaDataException(_('Invalid VercodeOperation: {field}')
+                                    .format(field=app.VercodeOperation))
         oldvercode = str(int(vercode))
         op = app.VercodeOperation.replace("%c", oldvercode)
         vercode = str(eval(op))
@@ -511,6 +522,37 @@ def checkupdates_app(app):
                 raise FDroidException("Git commit failed")
 
 
+def update_wiki(gplaylog, locallog):
+    if config.get('wiki_server') and config.get('wiki_path'):
+        try:
+            import mwclient
+            site = mwclient.Site((config['wiki_protocol'], config['wiki_server']),
+                                 path=config['wiki_path'])
+            site.login(config['wiki_user'], config['wiki_password'])
+
+            # Write a page with the last build log for this version code
+            wiki_page_path = 'checkupdates_' + time.strftime('%s', start_timestamp)
+            newpage = site.Pages[wiki_page_path]
+            txt = ''
+            txt += "* command line: <code>" + ' '.join(sys.argv) + "</code>\n"
+            txt += "* started at " + common.get_wiki_timestamp(start_timestamp) + '\n'
+            txt += "* completed at " + common.get_wiki_timestamp() + '\n'
+            txt += "\n\n"
+            txt += common.get_android_tools_version_log()
+            txt += "\n\n"
+            if gplaylog:
+                txt += '== --gplay check ==\n\n'
+                txt += gplaylog
+            if locallog:
+                txt += '== local source check ==\n\n'
+                txt += locallog
+            newpage.save(txt, summary='Run log')
+            newpage = site.Pages['checkupdates']
+            newpage.save('#REDIRECT [[' + wiki_page_path + ']]', summary='Update redirect')
+        except Exception as e:
+            logging.error(_('Error while attempting to publish log: %s') % e)
+
+
 config = None
 options = None
 start_timestamp = time.gmtime()
@@ -530,6 +572,8 @@ def main():
                         help=_("Only process apps with auto-updates"))
     parser.add_argument("--commit", action="store_true", default=False,
                         help=_("Commit changes"))
+    parser.add_argument("--allow-dirty", action="store_true", default=False,
+                        help=_("Run on git repo that has uncommitted changes"))
     parser.add_argument("--gplay", action="store_true", default=False,
                         help=_("Only print differences with the Play Store"))
     metadata.add_metadata_arguments(parser)
@@ -538,6 +582,12 @@ def main():
 
     config = common.read_config(options)
 
+    if not options.allow_dirty:
+        status = subprocess.check_output(['git', 'status', '--porcelain'])
+        if status:
+            logging.error(_('Build metadata git repo has uncommited changes!'))
+            sys.exit(1)
+
     # Get all apps...
     allapps = metadata.read_metadata()
 
@@ -568,6 +618,7 @@ def main():
                     else:
                         logging.info("{0} has the same version {1} on the Play Store"
                                      .format(common.getappname(app), version))
+        update_wiki(gplaylog, None)
         return
 
     locallog = ''
@@ -588,34 +639,7 @@ def main():
             logging.error(msg)
             locallog += msg + '\n'
 
-    if config.get('wiki_server') and config.get('wiki_path'):
-        try:
-            import mwclient
-            site = mwclient.Site((config['wiki_protocol'], config['wiki_server']),
-                                 path=config['wiki_path'])
-            site.login(config['wiki_user'], config['wiki_password'])
-
-            # Write a page with the last build log for this version code
-            wiki_page_path = 'checkupdates_' + time.strftime('%s', start_timestamp)
-            newpage = site.Pages[wiki_page_path]
-            txt = ''
-            txt += "* command line: <code>" + ' '.join(sys.argv) + "</code>\n"
-            txt += "* started at " + common.get_wiki_timestamp(start_timestamp) + '\n'
-            txt += "* completed at " + common.get_wiki_timestamp() + '\n'
-            txt += "\n\n"
-            txt += common.get_android_tools_version_log()
-            txt += "\n\n"
-            if gplaylog:
-                txt += '== --gplay check ==\n\n'
-                txt += gplaylog
-            if locallog:
-                txt += '== local source check ==\n\n'
-                txt += locallog
-            newpage.save(txt, summary='Run log')
-            newpage = site.Pages['checkupdates']
-            newpage.save('#REDIRECT [[' + wiki_page_path + ']]', summary='Update redirect')
-        except Exception as e:
-            logging.error(_('Error while attempting to publish log: %s') % e)
+    update_wiki(None, locallog)
 
     logging.info(_("Finished"))