Skip to content

Commit

Permalink
Code review: 326160043: Added certifi and idna dependency for requests
Browse files Browse the repository at this point in the history
  • Loading branch information
joachimmetz committed Aug 5, 2017
1 parent 16b2c04 commit 8871cd9
Show file tree
Hide file tree
Showing 39 changed files with 881 additions and 862 deletions.
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ install:
- ps: (new-object net.webclient).DownloadFile('https://www.sqlite.org/2017/sqlite-dll-win32-x86-3180000.zip', 'C:\Projects\sqlite-dll-win32-x86-3180000.zip')
- ps: $Output = Invoke-Expression -Command "& 'C:\\Program Files\\7-Zip\\7z.exe' -y -oC:\\Projects\\ x C:\\Projects\\sqlite-dll-win32-x86-3180000.zip 2>&1"
- cmd: copy C:\Projects\sqlite3.dll C:\Python27\DLLs\
- cmd: mkdir dependencies && set PYTHONPATH=..\l2tdevtools && "%PYTHON%\\python.exe" ..\l2tdevtools\tools\update.py --download-directory dependencies --machine-type x86 --msi-targetdir "%PYTHON%" --track dev PyYAML XlsxWriter artifacts bencode binplist chardet construct dateutil dfdatetime dfvfs dfwinreg dpkt efilter hachoir-core hachoir-metadata hachoir-parser libbde libesedb libevt libevtx libewf libfsntfs libfvde libfwnt libfwsi liblnk libmsiecf libolecf libqcow libregf libscca libsigscan libsmdev libsmraw libvhdi libvmdk libvshadow libvslvm lzma pefile psutil pycrypto pyparsing pysqlite pytsk3 pytz pyzmq requests six urllib3 yara-python funcsigs mock pbr
- cmd: mkdir dependencies && set PYTHONPATH=..\l2tdevtools && "%PYTHON%\\python.exe" ..\l2tdevtools\tools\update.py --download-directory dependencies --machine-type x86 --msi-targetdir "%PYTHON%" --track dev PyYAML XlsxWriter artifacts bencode binplist certifi chardet construct dateutil dfdatetime dfvfs dfwinreg dpkt efilter hachoir-core hachoir-metadata hachoir-parser idna libbde libesedb libevt libevtx libewf libfsntfs libfvde libfwnt libfwsi liblnk libmsiecf libolecf libqcow libregf libscca libsigscan libsmdev libsmraw libvhdi libvmdk libvshadow libvslvm lzma pefile psutil pycrypto pyparsing pysqlite pytsk3 pytz pyzmq requests six urllib3 yara-python funcsigs mock pbr

build: off

Expand Down
4 changes: 2 additions & 2 deletions config/dpkg/changelog
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plaso (20170804-1) unstable; urgency=low
plaso (20170805-1) unstable; urgency=low

* Auto-generated

-- Log2Timeline <log2timeline-dev@googlegroups.com> Fri, 04 Aug 2017 14:36:41 +0200
-- Log2Timeline <log2timeline-dev@googlegroups.com> Sat, 05 Aug 2017 07:42:55 +0200
2 changes: 1 addition & 1 deletion config/dpkg/control
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Description: Data files for plaso (log2timeline)

Package: python-plaso
Architecture: all
Depends: plaso-data, libbde-python (>= 20140531), libesedb-python (>= 20150409), libevt-python (>= 20120410), libevtx-python (>= 20141112), libewf-python (>= 20131210), libfsntfs-python (>= 20151130), libfvde-python (>= 20160719), libfwnt-python (>= 20160418), libfwsi-python (>= 20150606), liblnk-python (>= 20150830), libmsiecf-python (>= 20150314), libolecf-python (>= 20151223), libqcow-python (>= 20131204), libregf-python (>= 20150315), libscca-python (>= 20161031), libsigscan-python (>= 20150627), libsmdev-python (>= 20140529), libsmraw-python (>= 20140612), libvhdi-python (>= 20131210), libvmdk-python (>= 20140421), libvshadow-python (>= 20160109), libvslvm-python (>= 20160109), python-artifacts (>= 20170521), python-bencode, python-binplist (>= 0.1.4), python-chardet (>= 2.3.0), python-construct (>= 2.5.2), python-crypto (>= 2.6.0), python-dateutil (>= 1.5), python-dfdatetime (>= 20170529), python-dfvfs (>= 20160803), python-dfwinreg (>= 20170521), python-dpkt (>= 1.8), python-efilter (>= 1.5), python-hachoir-core (>= 1.3.3), python-hachoir-metadata (>= 1.3.3), python-hachoir-parser (>= 1.3.4), python-lzma (>= 0.5.3), python-pefile (>= 1.2.10-139), python-psutil (>= 1.2.1), python-pyparsing (>= 2.0.3), python-pysqlite, python-pytsk3 (>= 20160721), python-requests (>= 2.2.1), python-six (>= 1.1.0), python-tz, python-urllib3 (>= 1.7.1), python-xlsxwriter (>= 0.9.3), python-yaml (>= 3.10), python-yara (>= 3.4.0), python-zmq (>= 2.1.11), ${python:Depends}, ${misc:Depends}
Depends: plaso-data, libbde-python (>= 20140531), libesedb-python (>= 20150409), libevt-python (>= 20120410), libevtx-python (>= 20141112), libewf-python (>= 20131210), libfsntfs-python (>= 20151130), libfvde-python (>= 20160719), libfwnt-python (>= 20160418), libfwsi-python (>= 20150606), liblnk-python (>= 20150830), libmsiecf-python (>= 20150314), libolecf-python (>= 20151223), libqcow-python (>= 20131204), libregf-python (>= 20150315), libscca-python (>= 20161031), libsigscan-python (>= 20150627), libsmdev-python (>= 20140529), libsmraw-python (>= 20140612), libvhdi-python (>= 20131210), libvmdk-python (>= 20140421), libvshadow-python (>= 20160109), libvslvm-python (>= 20160109), python-artifacts (>= 20170521), python-bencode, python-binplist (>= 0.1.4), python-certifi (>= 2016.9.26), python-chardet (>= 2.0.1), python-construct (>= 2.5.2), python-crypto (>= 2.6.0), python-dateutil (>= 1.5), python-dfdatetime (>= 20170529), python-dfvfs (>= 20160803), python-dfwinreg (>= 20170521), python-dpkt (>= 1.8), python-efilter (>= 1.5), python-hachoir-core (>= 1.3.3), python-hachoir-metadata (>= 1.3.3), python-hachoir-parser (>= 1.3.4), python-idna (>= 2.5), python-lzma (>= 0.5.3), python-pefile (>= 1.2.10-139), python-psutil (>= 1.2.1), python-pyparsing (>= 2.0.3), python-pysqlite, python-pytsk3 (>= 20160721), python-requests (>= 2.2.1), python-six (>= 1.1.0), python-tz, python-urllib3 (>= 1.7.1), python-xlsxwriter (>= 0.9.3), python-yaml (>= 3.10), python-yara (>= 3.4.0), python-zmq (>= 2.1.11), ${python:Depends}, ${misc:Depends}
Description: Python 2 module of plaso (log2timeline)
Plaso (log2timeline) is a framework to create super timelines. Its
purpose is to extract timestamps from various files found on typical
Expand Down
2 changes: 2 additions & 0 deletions config/linux/gift_copr_install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ PYTHON2_DEPENDENCIES="PyYAML
python-pytsk3
python-requests
python-six
python2-certifi
python2-idna
python2-urllib3
python2-yara
python2-zmq
Expand Down
2 changes: 2 additions & 0 deletions config/linux/gift_ppa_install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ PYTHON2_DEPENDENCIES="libbde-python
python-artifacts
python-bencode
python-binplist
python-certifi
python-chardet
python-construct
python-crypto
Expand All @@ -40,6 +41,7 @@ PYTHON2_DEPENDENCIES="libbde-python
python-hachoir-core
python-hachoir-metadata
python-hachoir-parser
python-idna
python-lzma
python-pefile
python-psutil
Expand Down
4 changes: 2 additions & 2 deletions config/travis/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@

COVERALL_DEPENDENCIES="python-coverage python-coveralls python-docopt";

L2TBINARIES_DEPENDENCIES="PyYAML XlsxWriter artifacts bencode binplist chardet construct dateutil dfdatetime dfvfs dfwinreg dpkt efilter hachoir-core hachoir-metadata hachoir-parser libbde libesedb libevt libevtx libewf libfsntfs libfvde libfwnt libfwsi liblnk libmsiecf libolecf libqcow libregf libscca libsigscan libsmdev libsmraw libvhdi libvmdk libvshadow libvslvm lzma pefile psutil pycrypto pyparsing pysqlite pytsk3 pytz pyzmq requests six urllib3 yara-python";
L2TBINARIES_DEPENDENCIES="PyYAML XlsxWriter artifacts bencode binplist certifi chardet construct dateutil dfdatetime dfvfs dfwinreg dpkt efilter hachoir-core hachoir-metadata hachoir-parser idna libbde libesedb libevt libevtx libewf libfsntfs libfvde libfwnt libfwsi liblnk libmsiecf libolecf libqcow libregf libscca libsigscan libsmdev libsmraw libvhdi libvmdk libvshadow libvslvm lzma pefile psutil pycrypto pyparsing pysqlite pytsk3 pytz pyzmq requests six urllib3 yara-python";

L2TBINARIES_TEST_DEPENDENCIES="funcsigs mock pbr";

PYTHON2_DEPENDENCIES="libbde-python libesedb-python libevt-python libevtx-python libewf-python libfsntfs-python libfvde-python libfwnt-python libfwsi-python liblnk-python libmsiecf-python libolecf-python libqcow-python libregf-python libscca-python libsigscan-python libsmdev-python libsmraw-python libvhdi-python libvmdk-python libvshadow-python libvslvm-python python-artifacts python-bencode python-binplist python-chardet python-construct python-crypto python-dateutil python-dfdatetime python-dfvfs python-dfwinreg python-dpkt python-efilter python-hachoir-core python-hachoir-metadata python-hachoir-parser python-lzma python-pefile python-psutil python-pyparsing python-pysqlite python-pytsk3 python-requests python-six python-tz python-urllib3 python-xlsxwriter python-yaml python-yara python-zmq";
PYTHON2_DEPENDENCIES="libbde-python libesedb-python libevt-python libevtx-python libewf-python libfsntfs-python libfvde-python libfwnt-python libfwsi-python liblnk-python libmsiecf-python libolecf-python libqcow-python libregf-python libscca-python libsigscan-python libsmdev-python libsmraw-python libvhdi-python libvmdk-python libvshadow-python libvslvm-python python-artifacts python-bencode python-binplist python-certifi python-chardet python-construct python-crypto python-dateutil python-dfdatetime python-dfvfs python-dfwinreg python-dpkt python-efilter python-hachoir-core python-hachoir-metadata python-hachoir-parser python-idna python-lzma python-pefile python-psutil python-pyparsing python-pysqlite python-pytsk3 python-requests python-six python-tz python-urllib3 python-xlsxwriter python-yaml python-yara python-zmq";

PYTHON2_TEST_DEPENDENCIES="python-mock python-tox";

Expand Down
13 changes: 12 additions & 1 deletion dependencies.ini
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,16 @@ version_property: __version__

[chardet]
dpkg_name: python-chardet
minimum_version: 2.3.0
minimum_version: 2.0.1
rpm_name: python-chardet
version_property: __version__

[certifi]
dpkg_name: python-certifi
minimum_version: 2016.9.26
rpm_name: python2-certifi
version_property: __version__

[construct]
dpkg_name: python-construct
maximum_version: 2.5.3
Expand Down Expand Up @@ -104,6 +110,11 @@ python2_only: true
rpm_name: python-hachoir-parser
version_property: __version__

[idna]
dpkg_name: python-idna
minimum_version: 2.5
rpm_name: python2-idna

[lzma]
dpkg_name: python-lzma
is_optional: true
Expand Down
56 changes: 28 additions & 28 deletions docs/plaso.analysis.rst
Original file line number Diff line number Diff line change
@@ -1,107 +1,107 @@
plaso.analysis package
======================
plaso\.analysis package
=======================

Submodules
----------

plaso.analysis.browser_search module
------------------------------------
plaso\.analysis\.browser\_search module
---------------------------------------

.. automodule:: plaso.analysis.browser_search
:members:
:undoc-members:
:show-inheritance:

plaso.analysis.chrome_extension module
--------------------------------------
plaso\.analysis\.chrome\_extension module
-----------------------------------------

.. automodule:: plaso.analysis.chrome_extension
:members:
:undoc-members:
:show-inheritance:

plaso.analysis.definitions module
---------------------------------
plaso\.analysis\.definitions module
-----------------------------------

.. automodule:: plaso.analysis.definitions
:members:
:undoc-members:
:show-inheritance:

plaso.analysis.file_hashes module
---------------------------------
plaso\.analysis\.file\_hashes module
------------------------------------

.. automodule:: plaso.analysis.file_hashes
:members:
:undoc-members:
:show-inheritance:

plaso.analysis.interface module
-------------------------------
plaso\.analysis\.interface module
---------------------------------

.. automodule:: plaso.analysis.interface
:members:
:undoc-members:
:show-inheritance:

plaso.analysis.manager module
-----------------------------
plaso\.analysis\.manager module
-------------------------------

.. automodule:: plaso.analysis.manager
:members:
:undoc-members:
:show-inheritance:

plaso.analysis.mediator module
------------------------------
plaso\.analysis\.mediator module
--------------------------------

.. automodule:: plaso.analysis.mediator
:members:
:undoc-members:
:show-inheritance:

plaso.analysis.nsrlsvr module
-----------------------------
plaso\.analysis\.nsrlsvr module
-------------------------------

.. automodule:: plaso.analysis.nsrlsvr
:members:
:undoc-members:
:show-inheritance:

plaso.analysis.tagging module
-----------------------------
plaso\.analysis\.tagging module
-------------------------------

.. automodule:: plaso.analysis.tagging
:members:
:undoc-members:
:show-inheritance:

plaso.analysis.unique_domains_visited module
--------------------------------------------
plaso\.analysis\.unique\_domains\_visited module
------------------------------------------------

.. automodule:: plaso.analysis.unique_domains_visited
:members:
:undoc-members:
:show-inheritance:

plaso.analysis.viper module
---------------------------
plaso\.analysis\.viper module
-----------------------------

.. automodule:: plaso.analysis.viper
:members:
:undoc-members:
:show-inheritance:

plaso.analysis.virustotal module
--------------------------------
plaso\.analysis\.virustotal module
----------------------------------

.. automodule:: plaso.analysis.virustotal
:members:
:undoc-members:
:show-inheritance:

plaso.analysis.windows_services module
--------------------------------------
plaso\.analysis\.windows\_services module
-----------------------------------------

.. automodule:: plaso.analysis.windows_services
:members:
Expand Down
24 changes: 12 additions & 12 deletions docs/plaso.analyzers.hashers.rst
Original file line number Diff line number Diff line change
@@ -1,43 +1,43 @@
plaso.analyzers.hashers package
===============================
plaso\.analyzers\.hashers package
=================================

Submodules
----------

plaso.analyzers.hashers.interface module
----------------------------------------
plaso\.analyzers\.hashers\.interface module
-------------------------------------------

.. automodule:: plaso.analyzers.hashers.interface
:members:
:undoc-members:
:show-inheritance:

plaso.analyzers.hashers.manager module
--------------------------------------
plaso\.analyzers\.hashers\.manager module
-----------------------------------------

.. automodule:: plaso.analyzers.hashers.manager
:members:
:undoc-members:
:show-inheritance:

plaso.analyzers.hashers.md5 module
----------------------------------
plaso\.analyzers\.hashers\.md5 module
-------------------------------------

.. automodule:: plaso.analyzers.hashers.md5
:members:
:undoc-members:
:show-inheritance:

plaso.analyzers.hashers.sha1 module
-----------------------------------
plaso\.analyzers\.hashers\.sha1 module
--------------------------------------

.. automodule:: plaso.analyzers.hashers.sha1
:members:
:undoc-members:
:show-inheritance:

plaso.analyzers.hashers.sha256 module
-------------------------------------
plaso\.analyzers\.hashers\.sha256 module
----------------------------------------

.. automodule:: plaso.analyzers.hashers.sha256
:members:
Expand Down
20 changes: 10 additions & 10 deletions docs/plaso.analyzers.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plaso.analyzers package
=======================
plaso\.analyzers package
========================

Subpackages
-----------
Expand All @@ -11,32 +11,32 @@ Subpackages
Submodules
----------

plaso.analyzers.hashing_analyzer module
---------------------------------------
plaso\.analyzers\.hashing\_analyzer module
------------------------------------------

.. automodule:: plaso.analyzers.hashing_analyzer
:members:
:undoc-members:
:show-inheritance:

plaso.analyzers.interface module
--------------------------------
plaso\.analyzers\.interface module
----------------------------------

.. automodule:: plaso.analyzers.interface
:members:
:undoc-members:
:show-inheritance:

plaso.analyzers.manager module
------------------------------
plaso\.analyzers\.manager module
--------------------------------

.. automodule:: plaso.analyzers.manager
:members:
:undoc-members:
:show-inheritance:

plaso.analyzers.yara_analyzer module
------------------------------------
plaso\.analyzers\.yara\_analyzer module
---------------------------------------

.. automodule:: plaso.analyzers.yara_analyzer
:members:
Expand Down
Loading

0 comments on commit 8871cd9

Please sign in to comment.