From e228e31b8436935a4f37511809878da57c1d4bd2 Mon Sep 17 00:00:00 2001
From: lilydjwg <lilydjwg@gmail.com>
Date: Thu, 20 Aug 2020 15:18:05 +0800
Subject: [PATCH] final tweak of keyfile

---
 .travis.yml               |   6 ++----
 keyfile.toml.enc          | Bin 0 -> 230 bytes
 nvchecker_source/gitea.py |   2 +-
 tests/conftest.py         |  15 ++++++++++++++-
 tests/test_github.py      |   4 +---
 5 files changed, 18 insertions(+), 9 deletions(-)
 create mode 100644 keyfile.toml.enc

diff --git a/.travis.yml b/.travis.yml
index 4d41ab2..2037421 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,14 +7,12 @@ python:
   - "3.8"
   - "nightly"
   - "pypy3.6-7.3.1"
+before_install: openssl enc -d -aes-256-ctr -pbkdf2 -k $KEY -in keyfile.toml.enc -out keyfile.toml
 install: pip install -U $DEPS pytest pytest-asyncio pytest-httpbin flaky structlog toml
 script: pytest
 env:
   global:
-    # github
-    - secure: "JNuxbHbO+Qj88r0So+FKp8GBVmobGlBNi0hkZIyOH4cBXtuiM1Jo6FtRYInfTUH5TcgfMQml1a8p9g8n1fbRcTsxPt3kkT0ZleW1fJNudOHJFOmDooM4gC2/A+6aMl3xdnLCQ9cXxqsXjIUBie3GhqC4ufInU7VshxOn7KZADbI3zDuLuw9gdsBQf/OADY4oO3y1URxdnWjssP8pwfDFRSEkuLKNDtsYrhkmp3jRAq5DMtMXTEyHly9CJHow7yMyoBHa6Q/J7+C57pI4JsO8c0nJWy/wQUnqw9EeLE/9gAHY1sHlEpjZtJrV45kRd+KC6x4FtoFjvngxymK2A0zmecBI3DRTWBAZedPPVatAD9nlDmwAacBtwvuZJkt6fMUBWMY1I1NEiwdYxceBiqrnvU48FfNOylXE6KuarCQZik/VWk8olIQjXIukMu8EQ58pnEuLZB7wbwNzMLheomuVMEK1nfLOltKaytztl/7cKlsx6SmxY5rQI/x7QInd+rq9OxDDwCo+jEofPKvAcCbUJj6SqfB7QAUxJwwD/ER4/Bji9KSz3BoCu+x7h/ILcskNqLlg4LDCcpxqMOyxePk7A30sSop1E5YLWo0lmS9s88mEz89tzCWSDVIzwQrdMghNBe6JFMzOoKDRDhEkMrs3MAK+FUJkbteGhHrdC86EidU="
-    # gitlab
-    - secure: "DjtWOVNYGGWQ9SHOrfqbh7SVm9DHOSUCYcgDmzIpSCbbFJq5wXAiuHwm8LBUOmjYVV73/pY01sSL7Ud/hO61WMXt3be++XHtEqaCTw9HXJzvnDNva/zudVQiSotLZfG9J9Jqi4EqdzfCB0MiN+1FhdomkJ2wbn5rRB+xUDzDJdnSR0RuutR3p9101VMbpBGnFbKOJUYBlYz6xptXsYpN56hYJstEcmjasJm1mrh1RttdPspl1L0Cy8CaXhf+z9Pke2xFKPIAzGo3P9jDGrZmLeKq4R693qfCjUWPATRWfI+YaSoSlNjefbdOJiDW2miNpu3yStMxyyxiMbNIQEfLiNIltmuLEUe618lmXUF38D4S23qsivXZ6hk7gbdA2dS1MUvaggmDnoGWciJF5Chf0cZ5Ft7C4mCL1kO8z8c9IlXswWcqEqmm4UZ2LwWkuU+xxCkPQIhOZ4IUJ2fSJO9ykOcvcIWqRFfl3UVl67NNKFaIKACm0TOEHWAMxMljrvwYRZ9c8mbslmJeBKQd3hNtQNgyB/9Abgg0/zvn818HtDpZyKMqmLC6w5OeBAwSijtD+a2nKqwFtOxa6tkmc+y0qZJkSI3CUPq/fOppTP8riHEhxXdv69GkPHpdoxfR0CuiEhBfeMiC4+woL1B8uTlBiFPKcRh6Vv8Z+zPq5ALObtw="
+    - secure: "t8ffqGkADmA8DQDnqswd/olWPM5smpibdkK67EwBy3fWwOpvWkEzmJm2ZLIF5JYRN8tG09v+54v0omHvhUrqmhTuR2wW6F9RgfeZhLfv12BW/XZCGBMW04oYPtROCWbEAFndaOBneh82suGjDtjgU+fKfUaAXLJBPFdJafLTnZaVcW/andLRpF1gEQDEfGg9Wqo7WMQjETeWQI6mXNkXmxtqKAMen7arPe18CiNMApf6ybLUnuTEyg4oi+1pgQ9sfSJqw/lYvWxIJe0ajBC+Izy9noaI+LqRITMj3zyX9c3yHMCRuJU+YUim+P58wHjpOOdhZFgIsadfkgmtLnkvXOihbGHUV6IVZ/ZroezJz8FiDg23L/z/iPKaSaKg3BvkNceS/UA8QZUCdGmM7C33iSi0JC/3jmdkip8MCCerfW5NkNT1a7V4uoEgnNPNeLYv8zYPMwVkGxwNckW2NJOhuY+R168Cfxye/Y0jydnT/jP4uZGWpVS8d0KDnl8qsX7O2ULX+E76CjCgdq7SM37tilhXbjH4bX/aaFpncOMWqw5YgpgYo9XIPZeiXIE8fjv/Eu1Ahxh7rv+bqP4SAICknRVIaLrzpVN3wYHMlDi93GoBisREe7nI78wvZxebI0NV+qvTII0Hak+hUJtDM6ujg/ZkqiEfppw9NonmHSgmQcE="
   jobs:
     - DEPS=aiohttp
     - DEPS="tornado pycurl"
diff --git a/keyfile.toml.enc b/keyfile.toml.enc
new file mode 100644
index 0000000000000000000000000000000000000000..15ceae4a308fa5d8841280050b7e86d4194f878e
GIT binary patch
literal 230
zcmV<C02%*NVQh3|WM5wpO`Y@>M(#=%UZEi;F%@z2*`PlvZ^Lq&9~ufP<qj90j7-!A
z0&Iaw$^o<xwX~FM9{U+FEZcs<M`FcI{zmP%Bljp>X(+LKA7L+JMi2v>E`BrXs4UbZ
zWr(~bkSV7DXswEJyE7_3o6B!Nb#=(gO``@Ww=~5%%K%n}lc5pY5>i7W-$;Y}0=)C&
zADl^EURa={ve*Kz3`;#31U*rB9knX-VXnD#Fl`wUwfH@MO`UdNE*OJ<asPa00X~rz
gY)hPT{UuOSUnUwPFr?UvwMX<rN(`E4V`@B~o{vjmO#lD@

literal 0
HcmV?d00001

diff --git a/nvchecker_source/gitea.py b/nvchecker_source/gitea.py
index 4280744..17cb558 100644
--- a/nvchecker_source/gitea.py
+++ b/nvchecker_source/gitea.py
@@ -30,7 +30,7 @@ async def get_version(
   token = conf.get('token')
   # Load token from keyman
   if token is None:
-    key_name = 'gitea_' + host.lower().replace('.', '_').replace("/", "_")
+    key_name = 'gitea_' + host.lower()
     token = keymanager.get_key(key_name)
 
   # Set private token if token exists.
diff --git a/tests/conftest.py b/tests/conftest.py
index 964b8e5..b99e69d 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -13,13 +13,15 @@ from nvchecker import core
 from nvchecker import __main__ as main
 from nvchecker.util import Entries, VersData, RawResult
 
+use_keyfile = False
+
 async def run(
   entries: Entries, max_concurrency: int = 20,
 ) -> VersData:
   token_q = core.token_queue(max_concurrency)
   result_q: asyncio.Queue[RawResult] = asyncio.Queue()
   keyfile = os.environ.get('KEYFILE')
-  if keyfile:
+  if use_keyfile and keyfile:
     filepath = Path(keyfile)
     keymanager = core.KeyManager(filepath)
   else:
@@ -89,3 +91,14 @@ def pytest_configure(config):
   config.addinivalue_line(
     'markers', 'needs_net: mark test to require Internet access',
   )
+
+@pytest.fixture
+def keyfile():
+  global use_keyfile
+  if 'KEYFILE' not in os.environ:
+    pytest.skip('KEYFILE not set')
+    return
+
+  use_keyfile = True
+  yield
+  use_keyfile = False
diff --git a/tests/test_github.py b/tests/test_github.py
index a874bda..c505c83 100644
--- a/tests/test_github.py
+++ b/tests/test_github.py
@@ -1,15 +1,13 @@
 # MIT licensed
 # Copyright (c) 2013-2020 lilydjwg <lilydjwg@gmail.com>, et al.
 
-import os
 import re
 
 import pytest
 
 pytestmark = [pytest.mark.asyncio,
               pytest.mark.needs_net,
-              pytest.mark.skipif("KEYFILE" not in os.environ,
-                                 reason="requires KEYFILE, or it fails too much")]
+              pytest.mark.usefixtures('keyfile')]
 
 async def test_github(get_version):
     assert await get_version("example", {