From 092703bcbcea2970fa65ddf42ee938b7721c8634 Mon Sep 17 00:00:00 2001 From: danieleperera Date: Sun, 5 Jul 2020 15:40:01 +0000 Subject: [PATCH] added license.md --- LICENSE.md | 22 ++++++++++++++++++++++ onionscraper/operators/onionscan.py | 2 +- onionscraper/test.py | 3 --- 3 files changed, 23 insertions(+), 4 deletions(-) create mode 100644 LICENSE.md delete mode 100644 onionscraper/test.py diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 0000000..d905116 --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,22 @@ +MIT License + +Copyright (c) [2020] [OnionIngestor] + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + diff --git a/onionscraper/operators/onionscan.py b/onionscraper/operators/onionscan.py index 781c9b9..fd22c61 100644 --- a/onionscraper/operators/onionscan.py +++ b/onionscraper/operators/onionscan.py @@ -212,7 +212,7 @@ class Plugin(Operator): # we have received valid results so we can kill the timer if process_timer.is_alive(): process_timer.cancel() - return self.response("success",stdout.decode(),onion) + return self.response("success",json.loads(stdout),onion) self.logger.info("[!!!] Process timed out for %s", onion) diff --git a/onionscraper/test.py b/onionscraper/test.py deleted file mode 100644 index 45cc998..0000000 --- a/onionscraper/test.py +++ /dev/null @@ -1,3 +0,0 @@ - -def hola(ass): - print(ass)