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.

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

refactor: python2 packages #117

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

# SIFT

![GitHub Downloads (all assets, all releases)](https://img.shields.io/github/downloads/teamdfir/sift-saltstack/total)

Built with [SaltStack](https://saltproject.io) installed with [Cast](https://github.com/ekristen/cast)

## Issues
Expand Down
3 changes: 2 additions & 1 deletion sift/python-packages/appcompatprocessor.sls
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,17 @@ include:
- sift.packages.python2-pip
- sift.packages.libregf
- sift.packages.python2-dev
- sift.packages.build-essential
- sift.python-packages.setuptools

appcompatprocessor:
pip.installed:
- name: git+https://github.com/mbevilacqua/appcompatprocessor.git@{{ commit }}
- bin_env: /usr/bin/python2
- upgrade: True
- require:
- sls: sift.packages.git
- sls: sift.packages.python2-pip
- sls: sift.packages.libregf
- sls: sift.packages.python2-dev
- sls: sift.packages.build-essential
- sls: sift.python-packages.setuptools
1 change: 0 additions & 1 deletion sift/python-packages/argparse.sls
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ sift-python-packages-argparse:
pip.installed:
- name: argparse
- bin_env: /usr/bin/python2
- upgrade: True
- require:
- sls: sift.packages.python2-pip
- sls: sift.python-packages.setuptools
1 change: 0 additions & 1 deletion sift/python-packages/bitstring.sls
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ sift-python-packages-bitstring:
pip.installed:
- name: bitstring
- bin_env: /usr/bin/python2
- upgrade: True
- require:
- sls: sift.packages.python2-pip
- sls: sift.python-packages.setuptools
3 changes: 2 additions & 1 deletion sift/python-packages/capstone.sls
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
include:
- sift.packages.python2-pip
- sift.packages.build-essential

sift-python-packages-pkg-remove:
pkg.removed:
Expand All @@ -9,7 +10,7 @@ sift-python-packages-capstone:
pip.installed:
- name: capstone
- bin_env: /usr/bin/python2
- upgrade: True
- require:
- sls: sift.packages.python2-pip
- sls: sift.packages.build-essential
- pkg: sift-python-packages-pkg-remove
1 change: 0 additions & 1 deletion sift/python-packages/colorama.sls
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ sift-python-packages-colorama:
pip.installed:
- name: colorama
- bin_env: /usr/bin/python2
- upgrade: True
- require:
- sls: sift.packages.python2-pip
- sls: sift.python-packages.setuptools
1 change: 0 additions & 1 deletion sift/python-packages/construct.sls
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ sift-python-packages-construct:
pip.installed:
- name: construct == 2.10.54 # note: pinned due to volatility2
- bin_env: /usr/bin/python2
- upgrade: True
- require:
- sls: sift.packages.python2-pip
- sls: sift.python-packages.setuptools
2 changes: 2 additions & 0 deletions sift/python-packages/distorm3.sls
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
include:
- sift.packages.python2-pip
- sift.packages.python2-dev
- sift.packages.build-essential
- sift.python-packages.setuptools

sift-python-packages-distorm3:
Expand All @@ -10,4 +11,5 @@ sift-python-packages-distorm3:
- require:
- sls: sift.packages.python2-pip
- sls: sift.packages.python2-dev
- sls: sift.packages.build-essential
- sls: sift.python-packages.setuptools
1 change: 0 additions & 1 deletion sift/python-packages/docopt.sls
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ sift-python-packages-docopt:
pip.installed:
- name: docopt
- bin_env: /usr/bin/python2
- upgrade: True
- require:
- sls: sift.packages.python2-pip
- sls: sift.python-packages.setuptools
2 changes: 0 additions & 2 deletions sift/python-packages/dpapick.sls
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@ include:
dpapick:
pip.installed:
- name: dpapick
- upgrade: True
- bin_env: /usr/bin/python2
#- install_options: --upgrade-strategy=only-if-needed
- require:
- sls: sift.packages.libssl-dev
- sls: sift.packages.python2-pip
Expand Down
1 change: 0 additions & 1 deletion sift/python-packages/geoip2.sls
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ sift-python-packages-geoip2:
pip.installed:
- name: geoip2
- bin_env: /usr/bin/python2
- upgrade: True
- require:
- sls: sift.packages.python2-pip
- sls: sift.python-packages.setuptools
3 changes: 1 addition & 2 deletions sift/python-packages/indxparse.sls
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% if grains['oscodename'] != "jammy" %}
{% if grains['oscodename'] == "focal" %}

{%- set user = salt['pillar.get']('sift_user', 'sansforensics') -%}
{%- set commit = "ca08236b0f70798cb6f89785820c9b82ee0c66ff" -%}
Expand All @@ -17,7 +17,6 @@ sift-python-packages-indxparse:
pip.installed:
- name: git+https://github.com/williballenthin/INDXParse.git@{{ commit }}
- bin_env: /usr/bin/python2
- upgrade: True
- require:
- sls: sift.packages.git
- sls: sift.packages.g++
Expand Down
1 change: 0 additions & 1 deletion sift/python-packages/ioc_writer.sls
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ sift-python-packages-ioc-writer:
pip.installed:
- name: ioc_writer
- bin_env: /usr/bin/python2
- upgrade: True
- require:
- sls: sift.packages.python2-pip
- sls: sift.python-packages.lxml
Expand Down
5 changes: 2 additions & 3 deletions sift/python-packages/m2crypto.sls
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,15 @@ include:
- sift.packages.swig
- sift.packages.python2-dev
- sift.packages.libssl-dev
- sift.python-packages.setuptools
- sift.packages.build-essential

sift-python-packages-m2crypto:
pip.installed:
- name: m2crypto==0.40.1
- bin_env: /usr/bin/python2
- upgrade: True
- require:
- sls: sift.packages.python2-pip
- sls: sift.packages.swig
- sls: sift.packages.python2-dev
- sls: sift.packages.libssl-dev
- sls: sift.python-packages.setuptools
- sls: sift.packages.build-essential
1 change: 0 additions & 1 deletion sift/python-packages/ntdsxtract.sls
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ sift-python-ntdsxtract:
pip.installed:
- name: git+https://github.com/csababarta/ntdsxtract.git@7fa1c8c28cbbf97a42bef40f20009dba85e4c25f
- bin_env: /usr/bin/python2
- upgrade: True
- require:
- sls: sift.packages.git
- sls: sift.packages.python2-pip
1 change: 0 additions & 1 deletion sift/python-packages/openpyxl.sls
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,5 @@ include:
openpyxl==2.1.2:
pip.installed:
- bin_env: /usr/bin/python2
- upgrade: True
- require:
- sls: sift.packages.python2-pip
1 change: 0 additions & 1 deletion sift/python-packages/pefile.sls
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,5 @@ sift-python-packages-pefile:
pip.installed:
- name: pefile
- bin_env: /usr/bin/python2
- upgrade: True
- require:
- sls: sift.packages.python2-pip
1 change: 0 additions & 1 deletion sift/python-packages/pillow.sls
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,5 @@ sift-python-packages-pillow:
pip.installed:
- name: pillow
- bin_env: /usr/bin/python2
- upgrade: True
- require:
- sls: sift.packages.python2-pip
1 change: 0 additions & 1 deletion sift/python-packages/poster.sls
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,5 @@ sift-python-packages-poster:
pip.installed:
- name: poster
- bin_env: /usr/bin/python2
- upgrade: True
- require:
- sls: sift.packages.python2-pip
1 change: 0 additions & 1 deletion sift/python-packages/pycoin.sls
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,5 @@ sift-python-packages-pycoin:
pip.installed:
- name: pycoin
- bin_env: /usr/bin/python2
- upgrade: True
- require:
- sls: sift.packages.python2-pip
7 changes: 6 additions & 1 deletion sift/python-packages/pycrypto.sls
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,17 @@

include:
- sift.packages.python2-pip
- sift.packages.python2-dev
- sift.python-packages.setuptools
- sift.packages.build-essential

sift-python-packages-pycrypto:
pip.installed:
- name: pycrypto
- bin_env: /usr/bin/python2
- upgrade: True
- require:
- sls: sift.packages.python2-pip
- sls: sift.packages.python2-dev
- sls: sift.python-packages.setuptools
- sls: sift.packages.build-essential

6 changes: 4 additions & 2 deletions sift/python-packages/pydasm.sls
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
include:
- sift.packages.git
- sift.packages.python2-pip
- sift.packages.python2-dev
- sift.packages.build-essential

pydasm:
pip.installed:
- name: git+https://github.com/jtpereyda/libdasm.git@68d61b1#egg=version_subpkg&subdirectory=pydasm
- bin_env: /usr/bin/python2
# - editable: git+https://github.com/jtpereyda/libdasm.git@68d61b1#egg=version_subpkg&subdirectory=pydasm
- upgrade: True
- require:
- sls: sift.packages.git
- sls: sift.packages.python2-pip
- sls: sift.packages.python2-dev
- sls: sift.packages.build-essential
2 changes: 1 addition & 1 deletion sift/python-packages/python-dateutil.sls
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ include:

sift-python-packages-python-dateutil:
pip.installed:
- name: python-dateutil >= 2.4.2
- name: 'python-dateutil>=2.4.2'
- bin_env: /usr/bin/python2
- require:
- sls: sift.packages.python2-pip
1 change: 0 additions & 1 deletion sift/python-packages/python-magic.sls
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,5 @@ sift-python-packages-python-magic:
pip.installed:
- name: python-magic
- bin_env: /usr/bin/python2
- upgrade: True
- require:
- sls: sift.packages.python2-pip
1 change: 0 additions & 1 deletion sift/python-packages/python-registry.sls
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,5 @@ sift-python-packages-python-registry:
pip.installed:
- name: python-registry
- bin_env: /usr/bin/python2
- upgrade: True
- require:
- sls: sift.packages.python2-pip
1 change: 0 additions & 1 deletion sift/python-packages/requests.sls
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,5 @@ sift-python-packages-requests:
pip.installed:
- name: requests
- bin_env: /usr/bin/python2
- upgrade: True
- require:
- sls: sift.packages.python2-pip
1 change: 0 additions & 1 deletion sift/python-packages/s2sphere.sls
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,5 @@ sift-python-packages-s2sphere:
pip.installed:
- name: s2sphere
- bin_env: /usr/bin/python2
- upgrade: True
- require:
- sls: sift.packages.python2-pip
3 changes: 1 addition & 2 deletions sift/python-packages/setuptools.sls
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ include:

sift-python-packages-setuptools:
pip.installed:
- name: 'setuptools<66.0.0'
- name: setuptools
- bin_env: /usr/bin/python2
- upgrade: True
- require:
- sls: sift.packages.python2-pip
1 change: 0 additions & 1 deletion sift/python-packages/shellbags.sls
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ shellbags:
pip.installed:
- name: git+https://github.com/williballenthin/shellbags.git@fee76eb
- bin_env: /usr/bin/python2
- upgrade: True
- require:
- sls: sift.packages.git
- sls: sift.packages.python2-pip
1 change: 0 additions & 1 deletion sift/python-packages/simplejson.sls
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,5 @@ sift-python-packages-simplejson:
pip.installed:
- name: simplejson
- bin_env: /usr/bin/python2
- upgrade: True
- require:
- sls: sift.packages.python2-pip
1 change: 0 additions & 1 deletion sift/python-packages/six.sls
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,5 @@ sift-python-packages-six:
pip.installed:
- name: six
- bin_env: /usr/bin/python2
- upgrade: True
- require:
- sls: sift.packages.python2-pip
1 change: 0 additions & 1 deletion sift/python-packages/unicodecsv.sls
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,5 @@ sift-python-packages-unicodecsv:
pip.installed:
- name: unicodecsv
- bin_env: /usr/bin/python2
- upgrade: True
- require:
- sls: sift.packages.python2-pip
1 change: 0 additions & 1 deletion sift/python-packages/usnparser.sls
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,5 @@ sift-python-packages-usnparser:
pip.installed:
- name: usnparser
- bin_env: /usr/bin/python2
- upgrade: True
- require:
- sls: sift.packages.python2-pip
2 changes: 1 addition & 1 deletion sift/python-packages/volatility.sls
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
include:
- sift.packages.git
- sift.packages.python2-pip
- sift.packages.build-essential
- sift.python-packages.colorama
- sift.python-packages.construct
- sift.python-packages.dpapick
Expand All @@ -31,7 +32,6 @@ sift-python-packages-volatility:
pip.installed:
- name: git+https://github.com/volatilityfoundation/volatility.git@master
- bin_env: /usr/bin/python2
- upgrade: True
- require:
- sls: sift.packages.git
- sls: sift.packages.python2-pip
Expand Down
1 change: 0 additions & 1 deletion sift/python-packages/wheel.sls
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,5 @@ sift-python-packages-wheel:
pip.installed:
- name: wheel
- bin_env: /usr/bin/python2
- upgrade: True
- require:
- sls: sift.packages.python2-pip
1 change: 0 additions & 1 deletion sift/python-packages/windowsprefetch.sls
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,5 @@ sift-python-packages-windowsprefetch:
pip.installed:
- name: windowsprefetch
- bin_env: /usr/bin/python2
- upgrade: True
- require:
- sls: sift.packages.python2-pip
5 changes: 4 additions & 1 deletion sift/python-packages/yara-python.sls
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,14 @@

include:
- sift.packages.python2-pip
- sift.packages.python2-dev
- sift.packages.build-essential

sift-python-packages-yara-python:
pip.installed:
- name: yara-python
- bin_env: /usr/bin/python2
- upgrade: True
- require:
- sls: sift.packages.python2-pip
- sls: sift.packages.python2-dev
- sls: sift.packages.build-essential
4 changes: 2 additions & 2 deletions sift/python3-packages/core.sls
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
include:
- sift.python3-packages.pip
#- sift.python3-packages.pip
- sift.python3-packages.wheel
- sift.python3-packages.setuptools

sift-python3-packages-core:
test.nop:
- name: python3-packages-core
- require:
- sls: sift.python3-packages.pip
#- sls: sift.python3-packages.pip
- sls: sift.python3-packages.wheel
- sls: sift.python3-packages.setuptools
Loading
Loading