Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update protobuf version to 4, regenerate pb-parsing code, and updat… #189

Merged
merged 6 commits into from
Oct 23, 2023
Merged

Update protobuf version to 4, regenerate pb-parsing code, and updat… #189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
70ea141
Update `protobuf` version to 4, regenerate pb-parsing code, and updat…
obsidianforensics Oct 23, 2023
2c7298f
Update unit-tests.yml
obsidianforensics Oct 23, 2023
6365426
Merge pull request #190 from obsidianforensics/update-test-versions
obsidianforensics Oct 23, 2023
e50f2cf
Up dependency versions
obsidianforensics Oct 23, 2023
9bbe1b0
Merge branch 'issue-188' of https://github.com/obsidianforensics/unfu…
obsidianforensics Oct 23, 2023
d4a6662
Comment out LinkedIn shortlink test; functionality is currently broke…
obsidianforensics Oct 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/unit-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python-version: ['3.8', '3.9', '3.10']
os: [ubuntu-20.04, windows-latest, macos-11, macos-12]
python-version: ['3.10', '3.11', '3.12']
os: [ubuntu-latest, windows-latest, macos-latest]

steps:
- uses: actions/checkout@v3
Expand Down
8 changes: 4 additions & 4 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
dnslib
flask >= 2.2.0
flask-restx >= 1.0.1
flask == 2.3.0
flask-restx >= 1.2.0
flask_cors
maclookup
networkx
protobuf == 3.*
protobuf == 4.*
publicsuffix2
pycountry
pymispwarninglists >= 1.5
Requests
setuptools
torf
ulid-py
Werkzeug >= 2.2.0
Werkzeug == 2.3.0
10 changes: 5 additions & 5 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,22 +18,22 @@
author='Ryan Benson',
author_email='[email protected]',
license='Apache',
keywords=['unfurl', 'forensics', 'dfir', 'reverse-engineering', 'security'],
keywords=['unfurl', 'forensics', 'dfir', 'reverse-engineering', 'security', 'osint', 'digital forensics'],
classifiers=[],
install_requires=[
'dnslib',
'flask>=2.2.0',
'flask==2.3.0',
'flask_cors',
'flask-restx>=1.0.1',
'flask-restx>=1.2.0',
'maclookup',
'networkx',
'protobuf==3.*',
'protobuf==4.*',
'publicsuffix2',
'pycountry',
'pymispwarninglists>=1.5',
'Requests',
'torf',
'ulid-py',
'Werkzeug>=2.2.0'
'Werkzeug==2.3.0'
]
)
3 changes: 1 addition & 2 deletions unfurl/parsers/parse_protobuf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,8 @@ def parse_protobuf_into_nodes(pb_value_dict, pb_types, edge_type=None):
urlsafe_b64_m = utils.urlsafe_b64_re.fullmatch(node.value)
standard_b64_m = utils.standard_b64_re.fullmatch(node.value)
hex_m = utils.hex_re.fullmatch(node.value)
long_int_m = utils.long_int_re.fullmatch(node.value)
all_digits_m = utils.digits_re.fullmatch(node.value)
all_letters_m = utils.digits_re.fullmatch(node.value)
all_letters_m = utils.letters_re.fullmatch(node.value)

if hex_m and not (all_digits_m or all_letters_m):
decoded = bytes.fromhex(node.value)
Expand Down
306 changes: 17 additions & 289 deletions unfurl/parsers/proto/google_search_pb2.py
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading