From c594e635125bbc0eccc09802a4af457489861c30 Mon Sep 17 00:00:00 2001
From: canewsin <canews.in@gmail.com>
Date: Fri, 7 Jan 2022 02:29:04 +0530
Subject: [PATCH] Bug Fixes

---
 plugins                          |   2 +-
 src/Content/ContentDb.py         |   4 +--
 src/Site/Site.py                 |   2 +-
 src/Site/SiteManager.py          |  10 +++---
 src/Test/conftest.py             |   2 +-
 src/Test/testdata/chart.db-shm   | Bin 0 -> 32768 bytes
 src/Test/testdata/chart.db-wal   | Bin 0 -> 78312 bytes
 src/Test/testdata/content.db-shm | Bin 0 -> 32768 bytes
 src/Test/testdata/content.db-wal | Bin 0 -> 98912 bytes
 src/Test/testdata/filters.json   |   1 +
 src/Test/testdata/openssl.cnf    |  58 +++++++++++++++++++++++++++++++
 src/Test/testdata/sites.json     |   1 +
 src/Test/testdata/trackers.json  |   1 +
 src/Test/testdata/users.json     |   9 +++++
 src/User/User.py                 |  12 +++----
 15 files changed, 86 insertions(+), 16 deletions(-)
 create mode 100644 src/Test/testdata/chart.db-shm
 create mode 100644 src/Test/testdata/chart.db-wal
 create mode 100644 src/Test/testdata/content.db-shm
 create mode 100644 src/Test/testdata/content.db-wal
 create mode 100644 src/Test/testdata/filters.json
 create mode 100644 src/Test/testdata/openssl.cnf
 create mode 100644 src/Test/testdata/sites.json
 create mode 100644 src/Test/testdata/trackers.json
 create mode 100644 src/Test/testdata/users.json

diff --git a/plugins b/plugins
index 9cadd0c6..a55d1b02 160000
--- a/plugins
+++ b/plugins
@@ -1 +1 @@
-Subproject commit 9cadd0c69f5af06739cc34cc79dc650053a9b4bd
+Subproject commit a55d1b02488de996c32e515d3ecaf701dd515d46
diff --git a/src/Content/ContentDb.py b/src/Content/ContentDb.py
index f0401652..f284581e 100644
--- a/src/Content/ContentDb.py
+++ b/src/Content/ContentDb.py
@@ -82,7 +82,7 @@ class ContentDb(Db):
         return schema
 
     def initSite(self, site):
-        self.getSites()[site.address] = site
+        self.sites[site.address] = site
 
     def needSite(self, site):
         if site.address not in self.site_ids:
@@ -97,7 +97,7 @@ class ContentDb(Db):
         if site_id:
             self.execute("DELETE FROM site WHERE site_id = :site_id", {"site_id": site_id})
             del self.site_ids[site.address]
-            del self.getSites()[site.address]
+            del self.sites[site.address]
 
     def setContent(self, site, inner_path, content, size=0):
         self.insertOrUpdate("content", {
diff --git a/src/Site/Site.py b/src/Site/Site.py
index ace2a65e..46e19169 100644
--- a/src/Site/Site.py
+++ b/src/Site/Site.py
@@ -290,7 +290,7 @@ class Site(object):
         if not SiteManager.site_manager.sites:
             SiteManager.site_manager.sites = {}
         if not SiteManager.site_manager.sites.get(self.address):
-            SiteManager.site_manager.getSites()[self.address] = self
+            SiteManager.site_manager.sites[self.address] = self
             SiteManager.site_manager.load(False)
         SiteManager.site_manager.saveDelayed()
 
diff --git a/src/Site/SiteManager.py b/src/Site/SiteManager.py
index da199ee8..8175a1f5 100644
--- a/src/Site/SiteManager.py
+++ b/src/Site/SiteManager.py
@@ -73,7 +73,7 @@ class SiteManager(object):
                     except Exception as err:
                         self.log.debug("Error loading site %s: %s" % (address, err))
                         continue
-                    self.getSites()[address] = site
+                    self.sites[address] = site
                     self.log.debug("Loaded site %s in %.3fs" % (address, time.time() - s))
                     added += 1
                 elif startup:
@@ -88,7 +88,7 @@ class SiteManager(object):
         if cleanup:
             for address in list(self.sites.keys()):
                 if address not in address_found:
-                    del(self.getSites()[address])
+                    del(self.sites[address])
                     self.log.debug("Removed site: %s" % address)
 
             # Remove orpan sites from contentdb
@@ -106,7 +106,7 @@ class SiteManager(object):
                     if address in content_db.site_ids:
                         del content_db.site_ids[address]
                     if address in content_db.sites:
-                        del content_db.getSites()[address]
+                        del content_db.sites[address]
 
         self.loaded = True
         for address, settings in sites_need:
@@ -203,7 +203,7 @@ class SiteManager(object):
         self.log.debug("Added new site: %s" % address)
         config.loadTrackersFile()
         site = Site(address, settings=settings)
-        self.getSites()[address] = site
+        self.sites[address] = site
         if not site.settings["serving"]:  # Maybe it was deleted before
             site.settings["serving"] = True
         site.saveSettings()
@@ -226,7 +226,7 @@ class SiteManager(object):
     def delete(self, address):
         self.sites_changed = int(time.time())
         self.log.debug("Deleted site: %s" % address)
-        del(self.getSites()[address])
+        del(self.sites[address])
         # Delete from sites.json
         self.save()
 
diff --git a/src/Test/conftest.py b/src/Test/conftest.py
index 1a7c68e7..c8739086 100644
--- a/src/Test/conftest.py
+++ b/src/Test/conftest.py
@@ -219,7 +219,7 @@ def site(request):
     site = Site("1TeSTvb4w2PWE81S2rEELgmX2GCCExQGT")  # Create new Site object to load content.json files
     if not SiteManager.site_manager.sites:
         SiteManager.site_manager.sites = {}
-    SiteManager.site_manager.getSites()["1TeSTvb4w2PWE81S2rEELgmX2GCCExQGT"] = site
+    SiteManager.site_manager.sites["1TeSTvb4w2PWE81S2rEELgmX2GCCExQGT"] = site
     site.settings["serving"] = True
     return site
 
diff --git a/src/Test/testdata/chart.db-shm b/src/Test/testdata/chart.db-shm
new file mode 100644
index 0000000000000000000000000000000000000000..7c822be1e7e27ced30c9f50e2208298742b46757
GIT binary patch
literal 32768
zcmeI*Jx&5)5C-566vcngh67lUP<jC41#F3>rFXG0@dAW<cnS|dhlfCCHiXbpnt9&j
zWnn{>orivQvYNHbQMA|E=q`@e(dqs0`)#>iJiUB;J-%-?KhMk0>BIbWa^UylQe6h|
z`n#9y>D?iIyY-{n`)J4Ue*av4&TE`RPou-=S@b-55xtCFMf2W;009C72oNAZfB*pk
z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs
z0RjXF5FkL{zX<eV&qQvN5CZiC`rRg#dUKnYKyDh!9YR8&qQIcro>g&jGZV<IaYCS`
zK<-Nv0yPD4Q>YNADUdsIg+NUK+o5az@1{<H8w>=>3XIB5Zg2u)1O&<o+?Ji(-~{rS
fPC|eH0RjXF5FkK+009C72oNAZfB*pkwFLeEqhBZt

literal 0
HcmV?d00001

diff --git a/src/Test/testdata/chart.db-wal b/src/Test/testdata/chart.db-wal
new file mode 100644
index 0000000000000000000000000000000000000000..dbb007b034764e77aba0599fe7a52b307d79fdb7
GIT binary patch
literal 78312
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
X1Q0*~0R#|0009ILKmY**YDnOBiETRB

literal 0
HcmV?d00001

diff --git a/src/Test/testdata/content.db-shm b/src/Test/testdata/content.db-shm
new file mode 100644
index 0000000000000000000000000000000000000000..dfcb5880ffa6e96abc2f854c2e00c0c65b9eecfe
GIT binary patch
literal 32768
zcmeI*Jx)Sl5CzZ=6cv9E|DPMMa|<^1Zh!@7=?-)+tigoZ-kw%BVW~4O#8BASnasJ#
z<pCiN=FrdAeO$N9Ms(2Hw2SLW^lJ9<_^`O2KaH1@`Qqm7_WAYlbNPPP{qgg0t3IQ6
z{94QE?Vn40cN<1mzoTu&^Y!=gb>3qux*gq#j-$KLz36`QAUcU2MyJuE=y5dX5ds7V
z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk
z1PBlyK!5-N0t5&UAV7csf&VBlh&>azQ9=mR6BzcJRO-!bVgk8oD0c`6fr<j7etTBM
z$<0h4x5f#9ngY2mQ3%u&$W5U_pr%0X$Q1%L1#&yI5U44Td(nkJO@TZSKnT<n$g?nn
zKuv)>1x5(e6mb4g&HvrhDR7E`Kv{vavXdK}z&Qc}Wd$zEPHu1ld6KaZAV7cs0Rq1X
Fd;>p`DLViF

literal 0
HcmV?d00001

diff --git a/src/Test/testdata/content.db-wal b/src/Test/testdata/content.db-wal
new file mode 100644
index 0000000000000000000000000000000000000000..a78922375e66cae01ad55a26b077217f6a50a63f
GIT binary patch
literal 98912
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

literal 0
HcmV?d00001

diff --git a/src/Test/testdata/filters.json b/src/Test/testdata/filters.json
new file mode 100644
index 00000000..9e26dfee
--- /dev/null
+++ b/src/Test/testdata/filters.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/src/Test/testdata/openssl.cnf b/src/Test/testdata/openssl.cnf
new file mode 100644
index 00000000..ff59f6a4
--- /dev/null
+++ b/src/Test/testdata/openssl.cnf
@@ -0,0 +1,58 @@
+[ req ]
+default_bits        = 2048
+default_keyfile     = server-key.pem
+distinguished_name  = subject
+req_extensions      = req_ext
+x509_extensions     = x509_ext
+string_mask         = utf8only
+
+# The Subject DN can be formed using X501 or RFC 4514 (see RFC 4519 for a description).
+#   Its sort of a mashup. For example, RFC 4514 does not provide emailAddress.
+[ subject ]
+countryName         = US
+stateOrProvinceName = NY
+localityName        = New York
+organizationName    = Example, LLC
+
+# Use a friendly name here because its presented to the user. The server's DNS
+#   names are placed in Subject Alternate Names. Plus, DNS names here is deprecated
+#   by both IETF and CA/Browser Forums. If you place a DNS name here, then you
+#   must include the DNS name in the SAN too (otherwise, Chrome and others that
+#   strictly follow the CA/Browser Baseline Requirements will fail).
+commonName          = Example Company
+
+emailAddress        = test@example.com
+
+# Section x509_ext is used when generating a self-signed certificate. I.e., openssl req -x509 ...
+[ x509_ext ]
+
+subjectKeyIdentifier    = hash
+authorityKeyIdentifier  = keyid,issuer
+
+basicConstraints        = CA:FALSE
+keyUsage                = digitalSignature, keyEncipherment
+extendedKeyUsage        = clientAuth, serverAuth
+subjectAltName          = @alternate_names
+
+# RFC 5280, Section 4.2.1.12 makes EKU optional
+# CA/Browser Baseline Requirements, Appendix (B)(3)(G) makes me confused
+# extendedKeyUsage  = serverAuth, clientAuth
+
+# Section req_ext is used when generating a certificate signing request. I.e., openssl req ...
+[ req_ext ]
+
+subjectKeyIdentifier    = hash
+
+basicConstraints        = CA:FALSE
+keyUsage                = digitalSignature, keyEncipherment
+extendedKeyUsage        = clientAuth, serverAuth
+subjectAltName          = @alternate_names
+
+# RFC 5280, Section 4.2.1.12 makes EKU optional
+# CA/Browser Baseline Requirements, Appendix (B)(3)(G) makes me confused
+# extendedKeyUsage  = serverAuth, clientAuth
+
+[ alternate_names ]
+
+DNS.1       = nazwa.pl
+DNS.2       = www.nazwa.pl
\ No newline at end of file
diff --git a/src/Test/testdata/sites.json b/src/Test/testdata/sites.json
new file mode 100644
index 00000000..9e26dfee
--- /dev/null
+++ b/src/Test/testdata/sites.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/src/Test/testdata/trackers.json b/src/Test/testdata/trackers.json
new file mode 100644
index 00000000..9e26dfee
--- /dev/null
+++ b/src/Test/testdata/trackers.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/src/Test/testdata/users.json b/src/Test/testdata/users.json
new file mode 100644
index 00000000..fdadced4
--- /dev/null
+++ b/src/Test/testdata/users.json
@@ -0,0 +1,9 @@
+
+        {
+            "15E5rhcAUD69WbiYsYARh4YHJ4sLm2JEyc": {
+                "certs": {},
+                "master_seed": "024bceac1105483d66585d8a60eaf20aa8c3254b0f266e0d626ddb6114e2949a",
+                "sites": {}
+            }
+        }
+    
\ No newline at end of file
diff --git a/src/User/User.py b/src/User/User.py
index 96695748..dbcfc56f 100644
--- a/src/User/User.py
+++ b/src/User/User.py
@@ -61,13 +61,13 @@ class User(object):
         s = time.time()
         address_id = self.getAddressAuthIndex(address)  # Convert site address to int
         auth_privatekey = CryptBitcoin.hdPrivatekey(self.master_seed, address_id)
-        self.getSites()[address] = {
+        self.sites[address] = {
             "auth_address": CryptBitcoin.privatekeyToAddress(auth_privatekey),
             "auth_privatekey": auth_privatekey
         }
         self.saveDelayed()
         self.log.debug("Added new site: %s in %.3fs" % (address, time.time() - s))
-        return self.getSites()[address]
+        return self.sites[address]
 
     # Get user site data
     # Return: {"auth_address": "xxx", "auth_privatekey": "xxx"}
@@ -76,11 +76,11 @@ class User(object):
             if not create:
                 return {"auth_address": None, "auth_privatekey": None}  # Dont create user yet
             self.generateAuthAddress(address)
-        return self.getSites()[address]
+        return self.sites[address]
 
     def deleteSiteData(self, address):
         if address in self.sites:
-            del(self.getSites()[address])
+            del(self.sites[address])
             self.saveDelayed()
             self.log.debug("Deleted site: %s" % address)
 
@@ -101,9 +101,9 @@ class User(object):
             raise Exception("Random error: site exist!")
         # Save to sites
         self.getSiteData(site_address)
-        self.getSites()[site_address]["privatekey"] = site_privatekey
+        self.sites[site_address]["privatekey"] = site_privatekey
         self.save()
-        return site_address, bip32_index, self.getSites()[site_address]
+        return site_address, bip32_index, self.sites[site_address]
 
     # Get BIP32 address from site address
     # Return: BIP32 auth address