store url

Author: schiele

git-incrypt

@@ -45,9 +45,11 @@ plugin.encryptrefname.argtypes = [ctypes.c_void_p, ctypes.c_void_p]
 plugin.decryptrefname.argtypes = [ctypes.c_void_p, ctypes.c_void_p]
 plugin.set_option.argtypes = [ctypes.c_char_p, ctypes.c_size_t,
                               ctypes.c_char_p]
+plugin.geturl.restype = ctypes.c_char_p
 plugin.hashdata.argtypes = [ctypes.c_void_p, ctypes.c_size_t, ctypes.c_void_p]
 plugin.hashdatahex.argtypes = [ctypes.c_void_p, ctypes.c_size_t]
 plugin.hashdatahex.restype = ctypes.c_char_p
+plugin.globalinit.argtypes = [ctypes.c_char_p]
 
 if not hasattr(pygit2.enums, 'FileMode'):
     class FileMode(enum.IntFlag):
@@ -160,21 +162,19 @@ class CryptRepo:
 
     def __init__(self, clearname, url, init=None, forcetrust=False):
         assert clearname, 'This does not work yet outside a git repository'
-        plugin.globalinit()
-        self.prefix = f'refs/incrypt/{sha1hex(url.encode("utf-8"))}/'
-        self.url = url
+        plugin.globalinit(url.encode('utf-8'))
+        self.prefix = f'refs/incrypt/{sha1hex(plugin.geturl())}/'
         if init:
             self.repo = pygit2.init_repository(clearname, bare=True)
             template = self._mktemplate(init.name, init.email,
                                         init.date, init.m)
-            self.meta = MetaData(self.repo, self.url, self.prefix + '1/').init(
+            self.meta = MetaData(self.repo, self.prefix + '1/').init(
                 init.keys, template, 'refs/heads/master')
             self.trust(force=True, sign=True)
         else:
             self.repo = pygit2.Repository(clearname)
             self._fetch('_')
-            self.meta = MetaData(self.repo, self.url,
-                                 self.prefix + '1/').read()
+            self.meta = MetaData(self.repo, self.prefix + '1/').read()
             if forcetrust:
                 self.trust(force=forcetrust)
 
@@ -249,7 +249,7 @@ class CryptRepo:
             ['git', 'fetch',
              CryptRepo.verbosityflags[plugin.getverbosity()],
              '--progress' if plugin.getprogress() else '--no-progress',
-             '--no-write-fetch-head', '-p', self.url,
+             '--no-write-fetch-head', '-p', plugin.geturl().decode('utf-8'),
              f'+refs/heads/{pattern}:{self.prefix}1/{pattern}'],
             cwd=self.repo.path, check=True, stdout=sys.stderr)
 
@@ -392,7 +392,8 @@ class CryptRepo:
                 ['--progress' if plugin.getprogress()
                     else '--no-progress', '--porcelain'] +
                 (['--atomic'] if plugin.getatomic() else []) +
-                [self.url, '+' + self.prefix + '1/_:' + MetaData.REFNAME] +
+                [plugin.geturl().decode('utf-8'), '+' +
+                 self.prefix + '1/_:' + MetaData.REFNAME] +
                 [r[3] for r in xrefs],
                 cwd=self.repo.path, check=False, text=True,
                 stdout=subprocess.PIPE,
@@ -469,9 +470,8 @@ class MetaData:
     KEYVER = b'AES-256-CBC+IV'
     REFNAME = 'refs/heads/_'
 
-    def __init__(self, repo, url, prefix):
+    def __init__(self, repo, prefix):
         self.repo = repo
-        self.url = url
         self.prefix = prefix
         self.files = None
         self.key = None
@@ -483,7 +483,7 @@ class MetaData:
     def _gpg(self, args, inp):
         'run gpg'
         return subprocess.check_output(
-                [f'gpg@incrypt::{self.url}'] + args,
+                [f'gpg@incrypt::{plugin.geturl().decode("utf-8")}'] + args,
                 executable='gpg', input=inp)
 
     def init(self, gpgkeys, template, defaultbranch):

incrypt-plugin.c

@@ -12,11 +12,12 @@
 #include "hash.h"
 #include "hex.h"
 
-void globalinit(void);
+void globalinit(const char* url_arg);
 int set_option(const char *name, size_t namelen, const char *value);
 int getverbosity(void);
 int getprogress(void);
 int getatomic(void);
+const char* geturl(void);
 void setcryptkey(const unsigned char* k);
 unsigned char* encryptdata(const unsigned char* input, size_t inputlen,
 			   unsigned char* output, size_t* outputlen);
@@ -35,10 +36,15 @@ struct options {
 };
 static struct options options;
 
-void globalinit(void) {
+static char* url = NULL;
+
+void globalinit(const char* url_arg) {
+	size_t urllen = strlen(url_arg);
 	options.verbosity = 1;
 	options.progress = !!isatty(2);
 	options.atomic = 0;
+	url = malloc(urllen + 1);
+	memcpy(url, url_arg, urllen + 1);
 }
 
 /*static*/ int set_option(const char *name, size_t namelen, const char *value)
@@ -90,6 +96,10 @@ int getatomic(void)
 	return options.atomic;
 }
 
+const char* geturl(void) {
+	return url;
+}
+
 static unsigned char key[48];
 
 void setcryptkey(const unsigned char* k) {