From de763d7b7597fc854e847e72eb87d05a83f89a50 Mon Sep 17 00:00:00 2001 From: Jason Shepherd Date: Thu, 19 May 2016 16:49:41 +1000 Subject: [PATCH 1/2] added redhat ga repo --- src/victims_web/config.py | 3 +-- src/victims_web/plugin/charon.py | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/victims_web/config.py b/src/victims_web/config.py index a75a66a..b3a73db 100755 --- a/src/victims_web/config.py +++ b/src/victims_web/config.py @@ -86,8 +86,7 @@ ] # plugin.charon -MAVEN_REPOSITORIES = [ -] +MAVEN_REPOSITORIES = [('jboss-ga', 'https://maven.repository.redhat.com/ga/')] # WTF Config WTF_CSRF_ENABLED = False diff --git a/src/victims_web/plugin/charon.py b/src/victims_web/plugin/charon.py index 0881797..c29df49 100644 --- a/src/victims_web/plugin/charon.py +++ b/src/victims_web/plugin/charon.py @@ -36,7 +36,7 @@ } for (name, uri) in config.MAVEN_REPOSITORIES: if (name, uri) not in REPOSITORIES: - REPOSITORIES['java'].append(name, uri) + REPOSITORIES['java'].append([name, uri]) MANAGERS = {} @@ -85,13 +85,13 @@ def make_artifact(self, info): def download(self, info): def is_valid_sha1(value): - value = value.strip() return value is not None and len(value) == 40 artifact = self.make_artifact(info) queue = {} for repo in self.repos: uri = repo.get_artifact_uri(artifact, 'jar') + LOGGER.debug("Downloading from: %s" % uri) sha1 = repo.download_check_sum('sha1', uri) if is_valid_sha1(sha1) and sha1 not in queue: queue[sha1] = repo From 8af7fdce736475be3b982d69fa8215048f1717ea Mon Sep 17 00:00:00 2001 From: Jason Shepherd Date: Wed, 25 May 2016 11:50:02 +1000 Subject: [PATCH 2/2] fixed bool change in flask-login and changed test adminuser password --- requirements.txt | 2 +- test/mongo_test_user.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 50b431a..6e90bb9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ Flask-Admin>=1.0.7 Flask-Bcrypt Flask-Bootstrap Flask-Cache -Flask-Login>=0.1.1 +Flask-Login==0.2.11 pymongo==2.6.2 mongoengine==0.8.4 Flask-MongoEngine==0.7.0 diff --git a/test/mongo_test_user.json b/test/mongo_test_user.json index 257cec8..2137260 100644 --- a/test/mongo_test_user.json +++ b/test/mongo_test_user.json @@ -1,3 +1,3 @@ { "_id" : { "$oid" :"51983e5220f35e4c6270f2eb"}, "active" : true, "createdon" : { "$date" : 1364154129966 }, "roles" : [], "lastip" : "127.0.0.1", "lastlogin" : { "$date" : 1364154129966 }, "password" : "$2a$13$jzd55nRBgL23cfK1LWjUMuxelZuTosZeaf3OopFVrcNvRspoh8Uau", "username" : "defaulttest" } { "_id" : { "$oid" : "521eb88ddd7b08149b99a01b"}, "username" : "nonadminuser", "password" : "$2a$13$uQfLF868IqHafwuIVpUJp.UbukEUaOGODWXuF4UIVKjfxcSkcdhzm", "roles" : [], "active" : true, "createdon" : { "$date" : 1364154129966 }, "lastlogin" : { "$date" : 1364154129966 }} -{ "_id" : { "$oid" : "521eb8a9dd7b08149b99a01c"}, "username" : "adminuser", "password" : "$2a$13$lAbe1EHDZrl4hhlM22BTeulM5NNM9.ddAYofVzC4ZqU.G9h4vvJoO", "roles" : ["admin"], "active" : true, "createdon" : { "$date" : 1364154129966 }, "lastlogin" : { "$date" : 1364154129966 } } +{ "_id" : { "$oid" : "521eb8a9dd7b08149b99a01c"}, "username" : "adminuser", "password" : "$2b$13$lJIhF3DI0/XZISyPr62KBeFWwNfdxYwACHtyRxRUHTljjtIXV/n6W", "roles" : ["admin"], "active" : true, "createdon" : { "$date" : 1364154129966 }, "lastlogin" : { "$date" : 1364154129966 } }