Compare commits
12 Commits
b3d46abb91
...
main
Author | SHA1 | Date | |
---|---|---|---|
a1bad4139e | |||
7150957574 | |||
8bf481e6fc | |||
510e790155 | |||
7cf2f66783 | |||
84afbe61b8 | |||
c5aff5fd3b | |||
ae6b8f443c | |||
3051db8a7a | |||
57c316974b | |||
c1b379e922 | |||
85d6715854 |
198
.gitignore
vendored
198
.gitignore
vendored
@ -1,166 +1,34 @@
|
|||||||
# ---> Python
|
|
||||||
# Byte-compiled / optimized / DLL files
|
|
||||||
__pycache__/
|
|
||||||
*.py[cod]
|
|
||||||
*$py.class
|
|
||||||
*.diff
|
|
||||||
.pylint.*
|
|
||||||
|
|
||||||
# C extensions
|
|
||||||
*.so
|
|
||||||
|
|
||||||
# Distribution / packaging
|
|
||||||
.Python
|
|
||||||
build/
|
|
||||||
develop-eggs/
|
|
||||||
dist/
|
|
||||||
downloads/
|
|
||||||
eggs/
|
|
||||||
.eggs/
|
|
||||||
lib/
|
|
||||||
lib64/
|
|
||||||
parts/
|
|
||||||
sdist/
|
|
||||||
var/
|
|
||||||
wheels/
|
|
||||||
share/python-wheels/
|
|
||||||
*.egg-info/
|
|
||||||
.installed.cfg
|
|
||||||
*.egg
|
|
||||||
MANIFEST
|
|
||||||
|
|
||||||
# PyInstaller
|
|
||||||
# Usually these files are written by a python script from a template
|
|
||||||
# before PyInstaller builds the exe, so as to inject date/other infos into it.
|
|
||||||
*.manifest
|
|
||||||
*.spec
|
|
||||||
|
|
||||||
# Installer logs
|
|
||||||
pip-log.txt
|
|
||||||
pip-delete-this-directory.txt
|
|
||||||
|
|
||||||
# Unit test / coverage reports
|
|
||||||
htmlcov/
|
|
||||||
.tox/
|
|
||||||
.nox/
|
|
||||||
.coverage
|
|
||||||
.coverage.*
|
|
||||||
.cache
|
|
||||||
nosetests.xml
|
|
||||||
coverage.xml
|
|
||||||
*.cover
|
|
||||||
*.py,cover
|
|
||||||
.hypothesis/
|
|
||||||
.pytest_cache/
|
|
||||||
cover/
|
|
||||||
|
|
||||||
# Translations
|
|
||||||
*.mo
|
|
||||||
*.pot
|
|
||||||
|
|
||||||
# Django stuff:
|
|
||||||
*.log
|
|
||||||
local_settings.py
|
|
||||||
db.sqlite3
|
|
||||||
db.sqlite3-journal
|
|
||||||
|
|
||||||
# Flask stuff:
|
|
||||||
instance/
|
|
||||||
.webassets-cache
|
|
||||||
|
|
||||||
# Scrapy stuff:
|
|
||||||
.scrapy
|
|
||||||
|
|
||||||
# Sphinx documentation
|
|
||||||
docs/_build/
|
|
||||||
|
|
||||||
# PyBuilder
|
|
||||||
.pybuilder/
|
|
||||||
target/
|
|
||||||
|
|
||||||
# Jupyter Notebook
|
|
||||||
.ipynb_checkpoints
|
|
||||||
|
|
||||||
# IPython
|
|
||||||
profile_default/
|
|
||||||
ipython_config.py
|
|
||||||
|
|
||||||
# pyenv
|
|
||||||
# For a library or package, you might want to ignore these files since the code is
|
|
||||||
# intended to run in multiple environments; otherwise, check them in:
|
|
||||||
# .python-version
|
|
||||||
|
|
||||||
# pipenv
|
|
||||||
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
|
|
||||||
# However, in case of collaboration, if having platform-specific dependencies or dependencies
|
|
||||||
# having no cross-platform support, pipenv may install dependencies that don't work, or not
|
|
||||||
# install all needed dependencies.
|
|
||||||
#Pipfile.lock
|
|
||||||
|
|
||||||
# poetry
|
|
||||||
# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
|
|
||||||
# This is especially recommended for binary packages to ensure reproducibility, and is more
|
|
||||||
# commonly ignored for libraries.
|
|
||||||
# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
|
|
||||||
#poetry.lock
|
|
||||||
|
|
||||||
# pdm
|
|
||||||
# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
|
|
||||||
#pdm.lock
|
|
||||||
# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
|
|
||||||
# in version control.
|
|
||||||
# https://pdm.fming.dev/#use-with-ide
|
|
||||||
.pdm.toml
|
|
||||||
|
|
||||||
# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
|
|
||||||
__pypackages__/
|
|
||||||
|
|
||||||
# Celery stuff
|
|
||||||
celerybeat-schedule
|
|
||||||
celerybeat.pid
|
|
||||||
|
|
||||||
# SageMath parsed files
|
|
||||||
*.sage.py
|
|
||||||
|
|
||||||
# Environments
|
|
||||||
.env
|
|
||||||
.venv
|
|
||||||
env/
|
|
||||||
venv/
|
|
||||||
ENV/
|
|
||||||
env.bak/
|
|
||||||
venv.bak/
|
|
||||||
|
|
||||||
# Spyder project settings
|
|
||||||
.spyderproject
|
|
||||||
.spyproject
|
|
||||||
|
|
||||||
# Rope project settings
|
|
||||||
.ropeproject
|
|
||||||
|
|
||||||
# mkdocs documentation
|
|
||||||
/site
|
|
||||||
|
|
||||||
# mypy
|
|
||||||
.mypy_cache/
|
|
||||||
.dmypy.json
|
|
||||||
dmypy.json
|
|
||||||
|
|
||||||
# Pyre type checker
|
|
||||||
.pyre/
|
|
||||||
|
|
||||||
# pytype static type analyzer
|
|
||||||
.pytype/
|
|
||||||
|
|
||||||
# Cython debug symbols
|
|
||||||
cython_debug/
|
|
||||||
|
|
||||||
# PyCharm
|
|
||||||
# JetBrains specific template is maintained in a separate JetBrains.gitignore that can
|
|
||||||
# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
|
|
||||||
# and can be added to the global gitignore or merged into this file. For a more nuclear
|
|
||||||
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
|
|
||||||
#.idea/
|
|
||||||
|
|
||||||
.pylint.err
|
.pylint.err
|
||||||
.pylint.log
|
.pylint.out
|
||||||
|
*.pyc
|
||||||
|
*.pyo
|
||||||
|
|
||||||
|
libs/
|
||||||
|
*.egg-info
|
||||||
|
*.log
|
||||||
|
*.out
|
||||||
|
*.bak
|
||||||
|
|
||||||
|
.idea
|
||||||
|
*~
|
||||||
|
#*
|
||||||
|
*.iml
|
||||||
|
*.junk
|
||||||
|
|
||||||
|
*.so
|
||||||
|
*.log
|
||||||
|
toxygen/build
|
||||||
|
toxygen/dist
|
||||||
|
*.spec
|
||||||
|
dist
|
||||||
|
toxygen/avatars
|
||||||
|
toxygen/__pycache__
|
||||||
|
/*.egg-info
|
||||||
|
/*.egg
|
||||||
|
html
|
||||||
|
Toxygen.egg-info
|
||||||
|
*.tox
|
||||||
|
.cache
|
||||||
|
*.db
|
||||||
|
*~
|
||||||
|
Makefile
|
||||||
|
7
.rsync.sh
Normal file
7
.rsync.sh
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
find * -name \*.py | xargs grep -l '[ ]*$' | xargs sed -i -e 's/[ ]*$//'
|
||||||
|
rsync "$@" -vax --include \*.py --exclude \*.log --exclude \*.out \
|
||||||
|
--exclude \*.egg-info --exclude libs --exclude dist --exclude build \
|
||||||
|
--exclude \*.pyc --exclude .pyl\* --exclude \*~ --exclude \*.so \
|
||||||
|
./ ../tox_profile.git/|grep -v /$
|
25
README.md
25
README.md
@ -7,7 +7,7 @@ Read and manipulate tox profile files. It started as a simple script from
|
|||||||
things that it finds. Then can write what it found in JSON/YAML/REPR/PPRINT
|
things that it finds. Then can write what it found in JSON/YAML/REPR/PPRINT
|
||||||
to a file. It can also test the nodes in a profile using ```nmap```.
|
to a file. It can also test the nodes in a profile using ```nmap```.
|
||||||
|
|
||||||
( There are somtimes problems with the json info dump of bytes keys:
|
( There are sometimes problems with the json info dump of bytes keys:
|
||||||
```TypeError: Object of type bytes is not JSON serializable```)
|
```TypeError: Object of type bytes is not JSON serializable```)
|
||||||
|
|
||||||
It can also download, select, or test nodes in a ```DHTnode.json``` file.
|
It can also download, select, or test nodes in a ```DHTnode.json``` file.
|
||||||
@ -222,10 +222,33 @@ Because it's written in Python it is easy to extend to, for example,
|
|||||||
supporting multidevices:
|
supporting multidevices:
|
||||||
<https://git.plastiras.org/emdee/tox_profile/wiki/MultiDevice-Announcements-POC>
|
<https://git.plastiras.org/emdee/tox_profile/wiki/MultiDevice-Announcements-POC>
|
||||||
|
|
||||||
|
There are a couple of bash scripts to show usage:
|
||||||
|
* tox_profile_examples.bash - simple example usage
|
||||||
|
* tox_profile_test.bash - a real test runner that still needs documenting.
|
||||||
|
|
||||||
## Specification
|
## Specification
|
||||||
|
|
||||||
There is a copy of the Tox [spec](https://toktok.ltd/spec.html)
|
There is a copy of the Tox [spec](https://toktok.ltd/spec.html)
|
||||||
in the repo - it is missing any description of the groups section.
|
in the repo - it is missing any description of the groups section.
|
||||||
|
|
||||||
|
## Updates
|
||||||
|
|
||||||
|
Although Tox works over Tor, we do not recommend its usage for
|
||||||
|
anonymity as it leaks DNS requests due to a 6-year old known security
|
||||||
|
issue: https://github.com/TokTok/c-toxcore/issues/469 unless your Tox
|
||||||
|
client does hostname lookups before calling Tox (like
|
||||||
|
[toxygen](https://git.plastiras.org/emdee/toxygen) does).
|
||||||
|
Otherwise, do not use it for anonymous communication unless you have a
|
||||||
|
TCP and UDP firewall in place.
|
||||||
|
|
||||||
|
The Tox project does not follow semantic versioning so the project may
|
||||||
|
break the underlying ctypes wrapper at any time; it's not possible to
|
||||||
|
use Tox version numbers to tell what the API will be. The last git version
|
||||||
|
this code was tested with is ``1623e3ee5c3a5837a92f959f289fcef18bfa9c959```
|
||||||
|
of Feb 12 10:06:37 2024. In which case you'll have to go into the tox.py
|
||||||
|
file in https://git.plastiras.org/emdee/toxygen_wrapper to fix it yourself.
|
||||||
|
|
||||||
|
The uptodate version of this code is on https://git.plastiras.org/emdee/tox_profile
|
||||||
|
|
||||||
Work on this project is suspended until the
|
Work on this project is suspended until the
|
||||||
[MultiDevice](https://git.plastiras.org/emdee/tox_profile/wiki/MultiDevice-Announcements-POC) problem is solved. Fork me!
|
[MultiDevice](https://git.plastiras.org/emdee/tox_profile/wiki/MultiDevice-Announcements-POC) problem is solved. Fork me!
|
||||||
|
0
__init__.py
Normal file
0
__init__.py
Normal file
48
pyproject.toml
Normal file
48
pyproject.toml
Normal file
@ -0,0 +1,48 @@
|
|||||||
|
[project]
|
||||||
|
name = 'tox_profile'
|
||||||
|
requires-python = ">= 3.7"
|
||||||
|
description = "Read and manipulate tox profile files"
|
||||||
|
keywords = ["tox", "tox_profile"]
|
||||||
|
classifiers = [
|
||||||
|
# How mature is this project? Common values are
|
||||||
|
# 3 - Alpha
|
||||||
|
# 4 - Beta
|
||||||
|
# 5 - Production/Stable
|
||||||
|
"Development Status :: 4 - Beta",
|
||||||
|
|
||||||
|
# Indicate who your project is intended for
|
||||||
|
"Intended Audience :: Developers",
|
||||||
|
|
||||||
|
# Specify the Python versions you support here.
|
||||||
|
"Programming Language :: Python :: 3",
|
||||||
|
"License :: OSI Approved",
|
||||||
|
"Operating System :: POSIX :: BSD :: FreeBSD",
|
||||||
|
"Operating System :: POSIX :: Linux",
|
||||||
|
"Programming Language :: Python :: 3 :: Only",
|
||||||
|
"Programming Language :: Python :: 3.7",
|
||||||
|
"Programming Language :: Python :: 3.8",
|
||||||
|
"Programming Language :: Python :: 3.9",
|
||||||
|
"Programming Language :: Python :: 3.10",
|
||||||
|
"Programming Language :: Python :: 3.11",
|
||||||
|
"Programming Language :: Python :: Implementation :: CPython",
|
||||||
|
]
|
||||||
|
dynamic = ["version", "readme", "dependencies"] # cannot be dynamic ['license']
|
||||||
|
|
||||||
|
[project.scripts]
|
||||||
|
tox_profile = "tox_profile:iMain"
|
||||||
|
|
||||||
|
[project.urls]
|
||||||
|
repository = "https://git.plastiras.org/emdee/tox_profile"
|
||||||
|
homepage = "https://git.plastiras.org/emdee/tox_profile"
|
||||||
|
|
||||||
|
[build-system]
|
||||||
|
requires = ["setuptools >= 61.0"]
|
||||||
|
build-backend = "setuptools.build_meta"
|
||||||
|
|
||||||
|
[tool.setuptools.dynamic]
|
||||||
|
version = {attr = "tox_profile.__version__"}
|
||||||
|
readme = {file = ["README.md"]}
|
||||||
|
dependencies = {file = ["requirements.txt"]}
|
||||||
|
|
||||||
|
#[tool.setuptools.packages.find]
|
||||||
|
#where = "src"
|
9
requirements.txt
Normal file
9
requirements.txt
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
# the versions are the current ones tested - may work with earlier versions
|
||||||
|
ruamel.yaml >= 0.18.5
|
||||||
|
xmsgpack >= 1.0.7
|
||||||
|
coloredlogs >= 15.0.1
|
||||||
|
# optional
|
||||||
|
# nmap
|
||||||
|
# this is not on pypi yet - get it from
|
||||||
|
# https://git.plastiras.org/emdee/toxygen_wrapper
|
||||||
|
# toxygen_wrapper >= 1.0.0
|
55
setup.cfg
Normal file
55
setup.cfg
Normal file
@ -0,0 +1,55 @@
|
|||||||
|
[metadata]
|
||||||
|
classifiers =
|
||||||
|
License :: OSI Approved
|
||||||
|
Intended Audience :: Web Developers
|
||||||
|
Operating System :: POSIX :: BSD :: FreeBSD
|
||||||
|
Operating System :: POSIX :: Linux
|
||||||
|
Programming Language :: Python :: 3 :: Only
|
||||||
|
Programming Language :: Python :: 3.7
|
||||||
|
Programming Language :: Python :: 3.8
|
||||||
|
Programming Language :: Python :: 3.9
|
||||||
|
Programming Language :: Python :: 3.10
|
||||||
|
Programming Language :: Python :: 3.11
|
||||||
|
Programming Language :: Python :: Implementation :: CPython
|
||||||
|
description='Read and manipulate tox profile files'
|
||||||
|
long_description='Read and manipulate tox profile files'
|
||||||
|
url='https://git.plastiras.org/emdee/tox_profile/'
|
||||||
|
keywords='ctypes Tox'
|
||||||
|
|
||||||
|
[options]
|
||||||
|
zip_safe = false
|
||||||
|
python_requires = >=3.7
|
||||||
|
include_package_data =
|
||||||
|
"*" = ["*.txt", "*.bash"]
|
||||||
|
|
||||||
|
[options.entry_points]
|
||||||
|
console_scripts =
|
||||||
|
tox_profile = tox_profile.tox_profile:iMain
|
||||||
|
|
||||||
|
[easy_install]
|
||||||
|
zip_ok = false
|
||||||
|
|
||||||
|
[flake8]
|
||||||
|
jobs = 1
|
||||||
|
max-line-length = 88
|
||||||
|
ignore =
|
||||||
|
E111
|
||||||
|
E114
|
||||||
|
E128
|
||||||
|
E225
|
||||||
|
E261
|
||||||
|
E302
|
||||||
|
E305
|
||||||
|
E402
|
||||||
|
E501
|
||||||
|
E502
|
||||||
|
E541
|
||||||
|
E701
|
||||||
|
E702
|
||||||
|
E704
|
||||||
|
E722
|
||||||
|
E741
|
||||||
|
F508
|
||||||
|
F541
|
||||||
|
W503
|
||||||
|
W601
|
0
src/__init__.py
Normal file
0
src/__init__.py
Normal file
2
src/tox_profile/__init__.py
Normal file
2
src/tox_profile/__init__.py
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
|
||||||
|
__version__ = "1.0.0"
|
5
src/tox_profile/__main__.py
Normal file
5
src/tox_profile/__main__.py
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
import sys
|
||||||
|
from tox_profile.tox_profile import iMain
|
||||||
|
|
||||||
|
if __name__ == '__main__':
|
||||||
|
sys.exit(iMain(sys.argv[1:]))
|
@ -74,7 +74,7 @@ from socket import AF_INET, AF_INET6, inet_ntop
|
|||||||
|
|
||||||
warnings.filterwarnings('ignore')
|
warnings.filterwarnings('ignore')
|
||||||
|
|
||||||
from wrapper_tests import support_testing as ts
|
from toxygen_wrapper.tests import support_testing as ts
|
||||||
|
|
||||||
try:
|
try:
|
||||||
# https://pypi.org/project/msgpack/
|
# https://pypi.org/project/msgpack/
|
||||||
@ -101,19 +101,21 @@ try:
|
|||||||
except ImportError as e: # noqa
|
except ImportError as e: # noqa
|
||||||
coloredlogs = False
|
coloredlogs = False
|
||||||
|
|
||||||
|
__version__ = "1.0.0"
|
||||||
|
|
||||||
try:
|
try:
|
||||||
# https://git.plastiras.org/emdee/toxygen_wrapper
|
# https://git.plastiras.org/emdee/toxygen_wrapper
|
||||||
from wrapper.toxencryptsave import ToxEncryptSave
|
from toxygen_wrapper.toxencryptsave import ToxEncryptSave
|
||||||
from wrapper_tests import support_testing as ts
|
from toxygen_wrapper.tests import support_testing as ts
|
||||||
from wrapper_tests.support_http import bAreWeConnected, download_url
|
from toxygen_wrapper.tests.support_http import bAreWeConnected, download_url
|
||||||
from wrapper_tests.support_testing import sTorResolve
|
from toxygen_wrapper.tests.support_testing import sTorResolve
|
||||||
except ImportError as e:
|
except ImportError as e:
|
||||||
print(f"Import Warning {e}")
|
print(f"Import Warning {e}")
|
||||||
print("Download toxygen_wrapper to deal with encrypted tox files, from:")
|
print("Download toxygen_wrapper to deal with encrypted tox files, from:")
|
||||||
print("https://git.plastiras.org/emdee/toxygen_wrapper")
|
print("https://git.plastiras.org/emdee/toxygen_wrapper")
|
||||||
print("Just put the parent of the wrapper directory on your PYTHONPATH")
|
print("Just put the parent of the toxygen_wrapper directory on your PYTHONPATH")
|
||||||
print("You also need to link your libtoxcore.so and libtoxav.so")
|
print("You also need to link your libtoxcore.so and libtoxav.so")
|
||||||
print("and libtoxencryptsave.so into wrapper/../libs/")
|
print("and libtoxencryptsave.so into toxygen_wrapper/../libs/")
|
||||||
print("Link all 3 from libtoxcore.so if you have only libtoxcore.so")
|
print("Link all 3 from libtoxcore.so if you have only libtoxcore.so")
|
||||||
ToxEncryptSave = None
|
ToxEncryptSave = None
|
||||||
download_url = None
|
download_url = None
|
||||||
@ -126,16 +128,17 @@ LOG = logging.getLogger('TSF')
|
|||||||
def LOG_error(a): print('EROR> '+a)
|
def LOG_error(a): print('EROR> '+a)
|
||||||
def LOG_warn(a): print('WARN> '+a)
|
def LOG_warn(a): print('WARN> '+a)
|
||||||
def LOG_info(a):
|
def LOG_info(a):
|
||||||
bVERBOSE = hasattr(__builtins__, 'oArgs') and oArgs.log_level <= 20
|
bVERBOSE = iLOG_LEVEL <= 20
|
||||||
if bVERBOSE: print('INFO> '+a)
|
if bVERBOSE: print('INFO> '+a)
|
||||||
def LOG_debug(a):
|
def LOG_debug(a):
|
||||||
bVERBOSE = hasattr(__builtins__, 'oArgs') and oArgs.log_level <= 10-1
|
bVERBOSE = iLOG_LEVEL <= 10-1
|
||||||
if bVERBOSE: print('DBUG> '+a)
|
if bVERBOSE: print('DBUG> '+a)
|
||||||
def LOG_trace(a):
|
def LOG_trace(a):
|
||||||
bVERBOSE = hasattr(__builtins__, 'oArgs') and oArgs.log_level < 10
|
bVERBOSE = iLOG_LEVEL < 10
|
||||||
if bVERBOSE: print('TRAC> '+a)
|
if bVERBOSE: print('TRAC> '+a)
|
||||||
|
|
||||||
# Fix for Windows
|
__version__ = "0.1.0"
|
||||||
|
# FixMe for Windows
|
||||||
sDIR = os.environ.get('TMPDIR', '/tmp')
|
sDIR = os.environ.get('TMPDIR', '/tmp')
|
||||||
sTOX_VERSION = "1000002018"
|
sTOX_VERSION = "1000002018"
|
||||||
sVER_MIN = "1000002013"
|
sVER_MIN = "1000002013"
|
||||||
@ -889,16 +892,16 @@ def lNodesCheckNodes(json_nodes, oArgs, bClean=False):
|
|||||||
|
|
||||||
if node["version"] and node["version"] < "1000002013":
|
if node["version"] and node["version"] < "1000002013":
|
||||||
lErrs += [nth]
|
lErrs += [nth]
|
||||||
LOG.error(f"vulnerable version {node['version']} < 1000002013")
|
LOG.error(f"{node['ipv4']}: vulnerable version {node['version']} < 1000002013")
|
||||||
elif node["version"] and node["version"] < sVER_MIN:
|
elif node["version"] and node["version"] < sVER_MIN:
|
||||||
LOG.warn(f"outdated version {node['version']} < {sVER_MIN}")
|
LOG.warn(f"{node['ipv4']}: outdated version {node['version']} < {sVER_MIN}")
|
||||||
|
|
||||||
# Put the onion address in the location after the country code
|
# Put the onion address in the location after the country code
|
||||||
if len(node["location"]) not in [2, 65]:
|
if len(node["location"]) not in [2, 65]:
|
||||||
LOG.warn(f"location {node['location']} should be a 2 digit country code, or 'code onion'")
|
LOG.warn(f"{node['ipv4']}: location {node['location']} should be a 2 digit country code, or 'code onion'")
|
||||||
elif len(node["location"]) == 65 and \
|
elif len(node["location"]) == 65 and \
|
||||||
not node["location"].endswith('.onion'):
|
not node["location"].endswith('.onion'):
|
||||||
LOG.warn(f"location {node['location']} should be a 2 digit country code 'code onion'")
|
LOG.warn(f"{node['ipv4']}: location {node['location']} should be a 2 digit country code 'code onion'")
|
||||||
elif len(node["location"]) == 65 and \
|
elif len(node["location"]) == 65 and \
|
||||||
node["location"].endswith('.onion') and bHAVE_TOR:
|
node["location"].endswith('.onion') and bHAVE_TOR:
|
||||||
onion = node["location"][3:]
|
onion = node["location"][3:]
|
||||||
@ -917,12 +920,12 @@ def lNodesCheckNodes(json_nodes, oArgs, bClean=False):
|
|||||||
pass
|
pass
|
||||||
else:
|
else:
|
||||||
if s:
|
if s:
|
||||||
LOG.info(f"Found an onion that resolves to {s}")
|
LOG.info(f"{node['ipv4']}: Found an onion that resolves to {s}")
|
||||||
else:
|
else:
|
||||||
LOG.warn(f"Found an onion that resolves to {s}")
|
LOG.warn(f"{node['ipv4']}: Found an onion that resolves to {s}")
|
||||||
|
|
||||||
if node['last_ping'] and time.time() - node['last_ping'] > iOLD_SECS:
|
if node['last_ping'] and time.time() - node['last_ping'] > iOLD_SECS:
|
||||||
LOG.debug(f"node has not been pinged in more than 3 months")
|
LOG.debug(f"{node['ipv4']}: node has not pinged in more than 3 months")
|
||||||
|
|
||||||
# suggestions YMMV
|
# suggestions YMMV
|
||||||
|
|
||||||
@ -938,16 +941,19 @@ def lNodesCheckNodes(json_nodes, oArgs, bClean=False):
|
|||||||
|
|
||||||
# fixme look for /etc/tor/torrc but it may not be readable
|
# fixme look for /etc/tor/torrc but it may not be readable
|
||||||
if bHAVE_TOR and os.path.exists('/etc/tor/torrc'):
|
if bHAVE_TOR and os.path.exists('/etc/tor/torrc'):
|
||||||
|
# get from torrc
|
||||||
|
address_range = '172.16.1' # 127.192.0
|
||||||
# print(sBLURB)
|
# print(sBLURB)
|
||||||
LOG.info("Add this section to your /etc/tor/torrc")
|
LOG.info("Add this section to your /etc/tor/torrc")
|
||||||
for line in lONION_CONFIG['vadr']:
|
for line in lONION_CONFIG['vadr']:
|
||||||
print(line)
|
print(line)
|
||||||
if lOnions:
|
if lOnions:
|
||||||
LOG.info("Add this section to your /etc/tor/torrc")
|
LOG.info("Add this section to your /etc/tor/torrc")
|
||||||
|
print('VirtualAddrNetwork {address_range}.0/10')
|
||||||
i = 1
|
i = 1
|
||||||
for line in lOnions:
|
for line in lOnions:
|
||||||
hosts = line.split(':')
|
hosts = line.split(':')
|
||||||
print(f"MapAddress {hosts[0]} 172.16.1.{i}")
|
print(f"MapAddress {hosts[0]} {address_range}.{i}")
|
||||||
i += 1
|
i += 1
|
||||||
|
|
||||||
if bClean:
|
if bClean:
|
||||||
@ -1130,7 +1136,7 @@ def iTestTorTest(sProOrNodes, oArgs, bClean=False):
|
|||||||
def iTestOnionNodes():
|
def iTestOnionNodes():
|
||||||
return 0
|
return 0
|
||||||
|
|
||||||
def iMain(sProOrNodes, oArgs):
|
def iMainFun(sProOrNodes, oArgs):
|
||||||
global bOUT, aOUT, sENC
|
global bOUT, aOUT, sENC
|
||||||
global bSAVE
|
global bSAVE
|
||||||
|
|
||||||
@ -1449,8 +1455,9 @@ def oMainArgparser(_=None):
|
|||||||
|
|
||||||
return parser
|
return parser
|
||||||
|
|
||||||
if __name__ == '__main__':
|
def iMain(lArgv=None):
|
||||||
lArgv = sys.argv[1:]
|
global iLOG_LEVEL
|
||||||
|
if lArgv is None: lArgv = sys.argv[1:]
|
||||||
parser = oMainArgparser()
|
parser = oMainArgparser()
|
||||||
oArgs = parser.parse_args(lArgv)
|
oArgs = parser.parse_args(lArgv)
|
||||||
if oArgs.command in ['edit'] and oArgs.edit == 'help':
|
if oArgs.command in ['edit'] and oArgs.edit == 'help':
|
||||||
@ -1460,10 +1467,11 @@ if __name__ == '__main__':
|
|||||||
print('Supported Quads: section,num,key,type ' +sEDIT_HELP)
|
print('Supported Quads: section,num,key,type ' +sEDIT_HELP)
|
||||||
sys.exit(0)
|
sys.exit(0)
|
||||||
|
|
||||||
__builtins__.oArgs = oArgs
|
|
||||||
vSetupLogging(oArgs.log_level)
|
vSetupLogging(oArgs.log_level)
|
||||||
|
iLOG_LEVEL = oArgs.log_level
|
||||||
i = 0
|
i = 0
|
||||||
for sProOrNodes in oArgs.lprofile:
|
for sProOrNodes in oArgs.lprofile:
|
||||||
i = iMain(sProOrNodes, oArgs)
|
i = iMainFun(sProOrNodes, oArgs)
|
||||||
|
|
||||||
sys.exit(i)
|
if __name__ == '__main__':
|
||||||
|
sys.exit(iMain(sys.argv[1:]))
|
24
tox_profile_examples.bash
Normal file
24
tox_profile_examples.bash
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
#!/bin/sh -e
|
||||||
|
# -*- mode: sh; fill-column: 75; tab-width: 8; coding: utf-8-unix -*-
|
||||||
|
|
||||||
|
# some examples of tox-profile usage
|
||||||
|
|
||||||
|
export PYTHONPATH=/mnt/o/var/local/src/toxygen_wrapper.git
|
||||||
|
TOX_HOME=$HOME/.config/tox
|
||||||
|
NMAP_CMD='sudo -u debian-tor nmap'
|
||||||
|
|
||||||
|
echo INFO: check the download json file
|
||||||
|
python3 tox_profile.py --command nodes --nodes check \
|
||||||
|
$TOX_HOME/DHTnodes.json.new \
|
||||||
|
2>&1 | tee /tmp/DHTnodes.json.log
|
||||||
|
|
||||||
|
echo INFO: get the tcp nodes/ports from the downloaded json file
|
||||||
|
python3 tox_profile.py --command nodes --nodes select_tcp \
|
||||||
|
--output /tmp/DHTnodes.json.tcp \
|
||||||
|
$TOX_HOME/DHTnodes.json.new
|
||||||
|
|
||||||
|
echo INFO: run ping/nmap on the tcp nodes/ports from the downloaded json file
|
||||||
|
python3 tox_profile.py --command nodes --nodes nmap_tcp \
|
||||||
|
--nmap_cmd $NMAP_CMD \
|
||||||
|
--output /tmp/DHTnodes.json.tcp.out \
|
||||||
|
/tmp/DHTnodes.json.tcp
|
340
tox_profile_test.bash
Executable file
340
tox_profile_test.bash
Executable file
@ -0,0 +1,340 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
# -*- mode: sh; fill-column: 75; tab-width: 8; coding: utf-8-unix -*-
|
||||||
|
|
||||||
|
# tox_profile.py has a lot of features so it needs test coverage
|
||||||
|
|
||||||
|
PREFIX=/mnt/o/var/local
|
||||||
|
ROLE=text
|
||||||
|
DEBUG=1
|
||||||
|
EXE=/var/local/bin/python3.bash
|
||||||
|
WRAPPER=$PREFIX/src/toxygen_wrapper.git
|
||||||
|
tox=$HOME/.config/tox/toxic_profile.tox
|
||||||
|
[ -s $tox ] || exit 2
|
||||||
|
target=$PREFIX/src/tox_profile/tox_profile.py
|
||||||
|
|
||||||
|
OUT=/tmp/toxic_profile
|
||||||
|
|
||||||
|
ps ax | grep -q tor && netstat -n4le | grep -q :9050
|
||||||
|
[ $? -eq 0 ] && HAVE_TOR=1 || HAVE_TOR=0
|
||||||
|
|
||||||
|
[ -f /usr/local/bin/usr_local_tput.bash ] && \
|
||||||
|
. /usr/local/bin/usr_local_tput.bash || {
|
||||||
|
DBUG() { echo DEBUG $* ; }
|
||||||
|
INFO() { echo INFO $* ; }
|
||||||
|
WARN() { echo WARN $* ; }
|
||||||
|
ERROR() { echo ERROR $* ; }
|
||||||
|
}
|
||||||
|
|
||||||
|
if [ -z "$TOXCORE_LIBS" ] && [ ! -d libs ] ; then
|
||||||
|
mkdir libs
|
||||||
|
cd libs
|
||||||
|
# /lib/x86_64-linux-gnu/libtoxcore.so.2
|
||||||
|
for pro in qtox toxic ; do
|
||||||
|
if which $pro 2> /dev/null ; then
|
||||||
|
DBUG linking to $pro libtoxcore
|
||||||
|
lib=$( ldd `which $pro` | grep libtoxcore|sed -e 's/.* => //' -e 's/ .*//')
|
||||||
|
[ -n "$lib" -a -f "$lib" ] || { WARN $Lib ; continue ; }
|
||||||
|
INFO linking to $lib
|
||||||
|
for elt in libtoxcore.so libtoxav.so libtoxencryptsave.so ; do
|
||||||
|
ln -s "$lib" "$elt"
|
||||||
|
done
|
||||||
|
export TOXCORE_LIBS=$PWD
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
cd ..
|
||||||
|
elif [ -z "$TOXCORE_LIBS" ] && [ -d libs ] ; then
|
||||||
|
export TOXCORE_LIBS=$PWD/libs
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
# set -- -e
|
||||||
|
[ -s $target ] || exit 1
|
||||||
|
|
||||||
|
[ -d $WRAPPER ] || {
|
||||||
|
ERROR wrapper is required https://git.plastiras.org/emdee/toxygen_wrapper
|
||||||
|
exit 3
|
||||||
|
}
|
||||||
|
export PYTHONPATH=$WRAPPER
|
||||||
|
|
||||||
|
json=$HOME/.config/tox/DHTnodes.json
|
||||||
|
[ -s $json ] || exit 4
|
||||||
|
|
||||||
|
which jq > /dev/null && HAVE_JQ=1 || HAVE_JQ=0
|
||||||
|
which nmap > /dev/null && HAVE_NMAP=1 || HAVE_NMAP=0
|
||||||
|
|
||||||
|
sudo rm -f $OUT.* /tmp/toxic_nodes.*
|
||||||
|
|
||||||
|
test_jq () {
|
||||||
|
[ $# -eq 3 ] || {
|
||||||
|
ERROR test_jq '#' "$@"
|
||||||
|
return 3
|
||||||
|
}
|
||||||
|
in=$1
|
||||||
|
out=$2
|
||||||
|
err=$3
|
||||||
|
[ -s $in ] || {
|
||||||
|
ERROR $i test_jq null $in
|
||||||
|
return 4
|
||||||
|
}
|
||||||
|
jq . < $in >$out 2>$err || {
|
||||||
|
ERROR $i test_jq $json
|
||||||
|
return 5
|
||||||
|
}
|
||||||
|
grep error: $err && {
|
||||||
|
ERROR $i test_jq $json
|
||||||
|
return 6
|
||||||
|
}
|
||||||
|
[ -s $out ] || {
|
||||||
|
ERROR $i null $out
|
||||||
|
return 7
|
||||||
|
}
|
||||||
|
[ -s $err ] || rm -f $err
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
|
||||||
|
i=0
|
||||||
|
[ "$HAVE_JQ" = 0 ] || \
|
||||||
|
test_jq $json /tmp/toxic_nodes.json /tmp/toxic_nodes.err || {
|
||||||
|
ERROR test_jq failed on $json
|
||||||
|
exit ${i}$?
|
||||||
|
}
|
||||||
|
[ -f /tmp/toxic_nodes.json ] || cp -p $json /tmp/toxic_nodes.json
|
||||||
|
json=/tmp/toxic_nodes.json
|
||||||
|
|
||||||
|
i=1
|
||||||
|
# required password
|
||||||
|
INFO $i decrypt $OUT.bin
|
||||||
|
$EXE $target --command decrypt --output $OUT.bin $tox || exit ${i}1
|
||||||
|
[ -s $OUT.bin ] || exit ${i}2
|
||||||
|
|
||||||
|
tox=$OUT.bin
|
||||||
|
INFO $i info $tox
|
||||||
|
$EXE $target --command info --info info $tox 2>$OUT.info || {
|
||||||
|
ERROR $i $EXE $target --command info --info info $tox
|
||||||
|
exit ${i}3
|
||||||
|
}
|
||||||
|
[ -s $OUT.info ] || exit ${i}4
|
||||||
|
|
||||||
|
INFO $i $EXE $target --command info --info save --output $OUT.save $tox
|
||||||
|
$EXE $target --command info --info save --output $OUT.save $tox 2>/dev/null || {
|
||||||
|
ERROR $?
|
||||||
|
exit ${i}5
|
||||||
|
}
|
||||||
|
|
||||||
|
[ -s $OUT.save ] || exit ${i}6
|
||||||
|
|
||||||
|
i=2
|
||||||
|
[ $# -ne 0 -a $1 -ne $i ] || \
|
||||||
|
! INFO $i Info and editing || \
|
||||||
|
for the_tox in $tox $OUT.save ; do
|
||||||
|
DBUG $i $the_tox
|
||||||
|
the_base=`echo $the_tox | sed -e 's/.save$//' -e 's/.tox$//'`
|
||||||
|
for elt in json yaml pprint repr ; do
|
||||||
|
if [ $elt = yaml -o $elt = json ] ; then
|
||||||
|
# ModuleNotFoundError
|
||||||
|
python3 -c "import $elt" 2>/dev/null || continue
|
||||||
|
fi
|
||||||
|
INFO $i $the_base.$elt
|
||||||
|
DBUG $EXE $target \
|
||||||
|
--command info --info $elt \
|
||||||
|
--output $the_base.$elt $the_tox '2>'$the_base.$elt.err
|
||||||
|
$EXE $target --command info --info $elt \
|
||||||
|
--output $the_base.$elt $the_tox 2>$the_base.$elt.err || {
|
||||||
|
tail $the_base.$elt.err
|
||||||
|
if [ $elt != yaml -a $elt != json ] ; then
|
||||||
|
exit ${i}0
|
||||||
|
else
|
||||||
|
WARN $elt
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
[ -s $the_base.$elt ] || {
|
||||||
|
WARN no output $the_base.$elt
|
||||||
|
# exit ${i}1
|
||||||
|
}
|
||||||
|
done
|
||||||
|
|
||||||
|
DBUG $EXE $target --command edit --edit help $the_tox
|
||||||
|
$EXE $target --command edit --edit help $the_tox 2>/dev/null || exit ${i}2
|
||||||
|
|
||||||
|
# edit the status message
|
||||||
|
INFO $i $the_base.Status_message 'STATUSMESSAGE,.,Status_message,Toxxed on Toxic'
|
||||||
|
$EXE $target --command edit --edit 'STATUSMESSAGE,.,Status_message,Toxxed on Toxic' \
|
||||||
|
--output $the_base.Status_message.tox $the_tox 2>&1|grep EDIT || exit ${i}3
|
||||||
|
[ -s $the_base.Status_message.tox ] || exit ${i}3
|
||||||
|
$EXE $target --command info $the_base.Status_message.tox 2>&1|grep Toxxed || exit ${i}4
|
||||||
|
|
||||||
|
# edit the nick_name
|
||||||
|
INFO $i $the_base.Nick_name 'NAME,.,Nick_name,FooBar'
|
||||||
|
$EXE $target --command edit --edit 'NAME,.,Nick_name,FooBar' \
|
||||||
|
--output $the_base.Nick_name.tox $the_tox 2>&1|grep EDIT || exit ${i}5
|
||||||
|
[ -s $the_base.Nick_name.tox ] || exit ${i}5
|
||||||
|
$EXE $target --command info $the_base.Nick_name.tox 2>&1|grep FooBar || exit ${i}6
|
||||||
|
|
||||||
|
# set the DHTnodes to empty
|
||||||
|
INFO $i $the_base.noDHT 'DHT,.,DHTnode,'
|
||||||
|
$EXE $target --command edit --edit 'DHT,.,DHTnode,' \
|
||||||
|
--output $the_base.noDHT.tox $the_tox 2>&1|grep EDIT || exit ${i}7
|
||||||
|
[ -s $the_base.noDHT.tox ] || exit ${i}7
|
||||||
|
$EXE $target --command info $the_base.noDHT.tox 2>&1 | grep 'NO DHT' || exit ${i}8
|
||||||
|
|
||||||
|
done
|
||||||
|
|
||||||
|
i=3
|
||||||
|
[ "$#" -ne 0 -a "$1" != "$i" ] || \
|
||||||
|
[ "$HAVE_JQ" = 0 ] || \
|
||||||
|
! INFO $i Nodes || \
|
||||||
|
for the_json in $json ; do
|
||||||
|
DBUG $i $the_json
|
||||||
|
the_base=`echo $the_json | sed -e 's/.json$//' -e 's/.tox$//'`
|
||||||
|
for nmap in clean check select_tcp select_udp select_version; do
|
||||||
|
$EXE $target --command nodes --nodes $nmap \
|
||||||
|
--output $the_base.$nmap.json $the_json || {
|
||||||
|
WARN $i $the_json $nmap ${i}1
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
[ -s $the_base.$nmap.json ] || {
|
||||||
|
WARN $i $the_json $nmap ${i}2
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
[ $nmap = select_tcp ] && \
|
||||||
|
grep '"status_tcp": false' $the_base.$nmap.json && {
|
||||||
|
WARN $i $the_json $nmap ${i}3
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
[ $nmap = select_udp ] && \
|
||||||
|
grep '"status_udp": false' $the_base.$nmap.json && {
|
||||||
|
WARN $i $the_json $nmap ${i}4
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
test_jq $the_base.$nmap.json $the_base.$nmap.json.out /tmp/toxic_nodes.err || {
|
||||||
|
retval=$?
|
||||||
|
WARN $i $the_base.$nmap.json 3$?
|
||||||
|
}
|
||||||
|
INFO $i $the_base.$nmap
|
||||||
|
done
|
||||||
|
done
|
||||||
|
|
||||||
|
i=4
|
||||||
|
##
|
||||||
|
[ $# -ne 0 -a "$1" -ne $i ] || \
|
||||||
|
[ "$HAVE_TOR" = 0 ] || \
|
||||||
|
[ ! -f /etc/tor/torrc ] || \
|
||||||
|
! INFO $i Onions || \
|
||||||
|
for the_tox in /etc/tor/torrc ; do
|
||||||
|
DBUG $i $the_tox
|
||||||
|
the_base=`echo $OUT.save | sed -e 's/.save$//' -e 's/.tox$//'`
|
||||||
|
# exits
|
||||||
|
for slot in config test; do
|
||||||
|
if [ $slot = exits ] && ! netstat -nle4 | grep -q :9050 ; then
|
||||||
|
WARN Tor not running
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
INFO $target --command onions --onions $slot \
|
||||||
|
--output $the_base.$slot.out $the_tox
|
||||||
|
DBUG=1 $EXE $target --command onions --onions $slot \
|
||||||
|
--log_level 10 \
|
||||||
|
--output $the_base.$slot.out $the_tox|| {
|
||||||
|
WARN $i $?
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
[ true -o -s $the_base.$slot.out ] || {
|
||||||
|
WARN $i empty $the_base.$slot.out
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
done
|
||||||
|
done
|
||||||
|
|
||||||
|
# ls -l $OUT.* /tmp/toxic_nodes.*
|
||||||
|
|
||||||
|
# DEBUG=0 /usr/local/bin/proxy_ping_test.bash tor || exit 0
|
||||||
|
ip route | grep ^def || exit 0
|
||||||
|
|
||||||
|
i=5
|
||||||
|
##
|
||||||
|
the_tox=$tox
|
||||||
|
[ $# -ne 0 -a "$1" != "$i" ] || \
|
||||||
|
[ "$HAVE_JQ" = 0 ] || \
|
||||||
|
[ "$HAVE_NMAP" = 0 ] || \
|
||||||
|
! INFO $i Making dogfood || \
|
||||||
|
for the_tox in $tox $OUT.save ; do
|
||||||
|
DBUG $i $the_tox
|
||||||
|
the_base=`echo $the_tox | sed -e 's/.save$//' -e 's/.tox$//'`
|
||||||
|
for nmap in nmap_relay nmap_dht nmap_path ; do
|
||||||
|
# [ $nmap = select_tcp ] && continue
|
||||||
|
if [ $nmap = nmap_dht ] && [ $HAVE_TOR = 1 ] ; then
|
||||||
|
INFO skipping $nmap because HAVE_TOR
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
INFO $i $the_base.$nmap
|
||||||
|
DBUG $target --command info --info $nmap \
|
||||||
|
--output $the_base.$nmap.out $the_tox
|
||||||
|
$EXE $target --command info --info $nmap \
|
||||||
|
--output $the_base.$nmap.out $the_tox 2>$the_base.$nmap.err || {
|
||||||
|
# select_tcp may be empty and jq errors
|
||||||
|
# exit ${i}1
|
||||||
|
WARN $i $? $the_base.$nmap.err
|
||||||
|
tail $the_base.$nmap.err
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
[ -s $the_base.$nmap.out ] || {
|
||||||
|
WARN $i empty $the_base.$nmap.out
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
done
|
||||||
|
done
|
||||||
|
|
||||||
|
i=6
|
||||||
|
##
|
||||||
|
[ $# -ne 0 -a "$1" != "$i" ] || \
|
||||||
|
[ "$HAVE_JQ" = 0 ] || \
|
||||||
|
! INFO $i Eating dogfood || \
|
||||||
|
for the_json in $json ; do
|
||||||
|
DBUG $i $the_json
|
||||||
|
the_base=`echo $the_json | sed -e 's/.save$//' -e 's/.json$//'`
|
||||||
|
for nmap in nmap_tcp nmap_udp ; do
|
||||||
|
if [ $nmap = nmap_udp ] && [ $HAVE_TOR = 1 ] ; then
|
||||||
|
INFO skipping $nmap because HAVE_TOR
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
INFO $i $target --command nodes --nodes $nmap --output $the_base.$nmap
|
||||||
|
$EXE $target --command nodes --nodes $nmap \
|
||||||
|
--output $the_base.$nmap $the_json 2>$the_base.$nmap.err || {
|
||||||
|
WARN $i $the_json $nmap ${i}1
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
[ -s $the_base.$nmap ] || {
|
||||||
|
ERROR $i $the_json $nmap ${i}2
|
||||||
|
exit ${i}2
|
||||||
|
}
|
||||||
|
done
|
||||||
|
done
|
||||||
|
|
||||||
|
i=7
|
||||||
|
DBUG $i
|
||||||
|
$EXE $target --command nodes --nodes download \
|
||||||
|
--output /tmp/toxic_nodes.new $json || {
|
||||||
|
ERROR $i $EXE $target --command nodes --nodes download $json
|
||||||
|
exit ${i}1
|
||||||
|
}
|
||||||
|
[ -s /tmp/toxic_nodes.new ] || exit ${i}4
|
||||||
|
INFO $i downloaded /tmp/toxic_nodes.new
|
||||||
|
json=/tmp/toxic_nodes.new
|
||||||
|
[ $# -ne 0 -a "$1" != "$i" ] || \
|
||||||
|
[ "$HAVE_JQ" = 0 ] || \
|
||||||
|
jq . < $json >/tmp/toxic_nodes.new.json 2>>/tmp/toxic_nodes.new.json.err || {
|
||||||
|
ERROR $i jq $json
|
||||||
|
exit ${i}2
|
||||||
|
}
|
||||||
|
INFO $i jq from /tmp/toxic_nodes.new.json
|
||||||
|
|
||||||
|
[ $# -ne 0 -a "$1" != "$i" ] || \
|
||||||
|
[ "$HAVE_JQ" = 0 ] || \
|
||||||
|
grep error: /tmp/toxic_nodes.new.json.err && {
|
||||||
|
ERROR $i jq $json
|
||||||
|
exit ${i}3
|
||||||
|
}
|
||||||
|
INFO $i no errors in /tmp/toxic_nodes.new.err
|
||||||
|
|
||||||
|
|
||||||
|
exit 0
|
Reference in New Issue
Block a user