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

Jump to bottom

rebase py3 onto develop and fix the merge conflicts #775

Merged
merged 12 commits into from
Jan 10, 2020
Merged

rebase py3 onto develop and fix the merge conflicts #775

merged 12 commits into from
Jan 10, 2020

Conversation

Tenebriso
Copy link
Contributor

No description provided.

@Tenebriso Tenebriso requested a review from jettero January 6, 2020 16:57
@daveed12
Copy link
Contributor

daveed12 commented Jan 9, 2020

LGTM

@jettero
Copy link
Contributor

jettero commented Jan 9, 2020

Oh, I never did try this out.

@Tenebriso Tenebriso merged commit 1204850 into hubblestack:py3 Jan 10, 2020
@Tenebriso Tenebriso deleted the py3_merge_fix branch January 10, 2020 11:56
jettero added a commit to jettero/hubble that referenced this pull request May 19, 2020
@jettero
Squashed commit of the following:
25b9b35 
commit 6c1a94b
Merge: ece5637 c54a685
Author: Paul Miller <jettero@cpan.org>
Date:   Mon May 18 14:15:42 2020 -0400

    Merge pull request hubblestack#848 from fossam/osquery_dockerfiles

    osquery dockerfiles and augeas folder fix

commit c54a685
Author: Andres Martinson <fossam@protonmail.com>
Date:   Mon May 18 10:56:35 2020 -0600

    Move osquery related changes lower in the Dockerfiles

    This should allow not having to rebuild all Hubble dependencies if there's
    a need for a change in osquery files.

commit ece5637
Merge: 9b1b177 ed8b4eb
Author: Paul Miller <jettero@cpan.org>
Date:   Wed May 13 08:55:15 2020 -0400

    Merge pull request hubblestack#846 from jettero/mem-leak-3

    resurrect old memory leak hunter

commit 9b1b177
Merge: 20e8d7d 69bc01a
Author: Paul Miller <jettero@cpan.org>
Date:   Wed May 13 08:54:58 2020 -0400

    Merge pull request hubblestack#844 from jettero/other-pkg-updates

    Other pkg updates

commit 20e8d7d
Merge: 74b0ea9 454af71
Author: Paul Miller <jettero@cpan.org>
Date:   Wed May 13 08:54:12 2020 -0400

    Merge pull request hubblestack#847 from jettero/s3-access-denied

    S3 access denied

commit 055a389
Author: Andres Martinson <fossam@protonmail.com>
Date:   Wed May 13 01:44:23 2020 -0600

    Replace COPY with ADD

commit 4fab106
Author: Andres Martinson <fossam@protonmail.com>
Date:   Tue May 12 02:22:25 2020 -0600

    Fixing default folder for augeas lenses

    Previously the augeas lenses folder was changed by directly modifying osquery
    source at the build time. This should be really set by Hubble as the flag
    exists for it.

commit 3d6adfa
Author: Andres Martinson <fossam@protonmail.com>
Date:   Tue May 12 02:05:24 2020 -0600

    Separate osquery from Hubble build

    This aims to shorten and simplify building and including
    osquery with Hubble. The new Dockerfile is introduced that builds
    osquery separately. The output file is ready to be included in Hubble
    build.

commit 454af71
Author: Paul Miller <paul@jettero.pl>
Date:   Tue May 5 16:06:20 2020 -0400

    acc denied on MANIFEST was coming up 4 and 6 times per second....  memoize

commit 7d82d3f
Author: Paul Miller <paul@jettero.pl>
Date:   Tue May 5 15:58:22 2020 -0400

    what file??

commit f281b93
Author: Paul Miller <paul@jettero.pl>
Date:   Tue May 5 15:39:43 2020 -0400

    forgot to add access denied...

commit f7fd999
Author: Paul Miller <paul@jettero.pl>
Date:   Tue May 5 15:33:25 2020 -0400

    If we fail to get a file, we should probably …

    fail in the same way as if we weren't trying to write one to disk

commit ed8b4eb
Author: Paul Miller <paul@jettero.pl>
Date:   Tue May 5 15:23:46 2020 -0400

    make sure we have objgraph, should we decide to memory trace

commit a9ce13b
Author: Paul Miller <paul@jettero.pl>
Date:   Tue May 5 15:11:50 2020 -0400

    the old memory leak module, slightly updated for modern hubble

commit 69bc01a
Author: Paul Miller <paul@jettero.pl>
Date:   Tue Apr 21 21:13:17 2020 -0400

    I apparently never copied the PoC PPC code to other oses

commit ed4480a
Author: Paul Miller <paul@jettero.pl>
Date:   Tue Apr 21 21:12:55 2020 -0400

    minor changes to the way pre_packaged_certificates builds

commit cd778bc
Author: Paul Miller <paul@jettero.pl>
Date:   Tue Apr 21 21:06:33 2020 -0400

    pass this back

commit 74b0ea9
Merge: 6d965a4 170c8be
Author: Paul Miller <jettero@cpan.org>
Date:   Tue Apr 21 20:47:47 2020 -0400

    Merge pull request hubblestack#838 from jettero/4.0-centos6-fix

    4.0 centos6 fix

commit 170c8be
Author: Paul Miller <paul@jettero.pl>
Date:   Wed Apr 8 11:46:10 2020 -0400

    pretty major typo

commit a3d3b2a
Author: Paul Miller <paul@jettero.pl>
Date:   Tue Apr 7 10:47:22 2020 -0400

    another bug introduced by PR 815

commit 112f1e5
Author: Paul Miller <paul@jettero.pl>
Date:   Tue Apr 7 10:45:18 2020 -0400

    this all seems to work; except …

    we're getting messages that (eg)
    ad5d369d1c80c22434890a49b84a2381b143a7da2db00ffcdf6404540a201eb6
    somehow doesn't match
    ad5d369d1c80c22434890a49b84a2381b143a7da2db00ffcdf6404540a201eb6

    hrm

commit ad659e5
Author: Paul Miller <paul@jettero.pl>
Date:   Tue Apr 7 09:52:17 2020 -0400

    Note to self: this isn't __utils__

commit 9b660bb
Author: Paul Miller <paul@jettero.pl>
Date:   Mon Apr 6 16:25:48 2020 -0400

    just getting started with this

commit 6d965a4
Merge: 6d87060 402ed28
Author: Paul Miller <jettero@cpan.org>
Date:   Tue Apr 7 08:03:01 2020 -0400

    Merge pull request hubblestack#835 from jettero/4.0-minor-fixes

    4.0 minor fixes

commit 402ed28
Author: Paul Miller <paul@jettero.pl>
Date:   Mon Apr 6 16:29:46 2020 -0400

    push the various changes back to dev dir

commit 78a7ba7
Author: Paul Miller <paul@jettero.pl>
Date:   Mon Apr 6 15:23:11 2020 -0400

    one more bug with centos6

commit 7d9aab6
Author: Paul Miller <paul@jettero.pl>
Date:   Mon Apr 6 15:21:29 2020 -0400

    debian uses sytemd

commit cd6ee07
Author: Paul Miller <paul@jettero.pl>
Date:   Mon Apr 6 14:41:34 2020 -0400

    this is needed for sqlite returner

commit 82138aa
Author: Paul Miller <paul@jettero.pl>
Date:   Thu Apr 2 11:08:40 2020 -0400

    some platforms seem to lack sqlite3

commit 1100734
Author: Paul Miller <paul@jettero.pl>
Date:   Thu Apr 2 11:07:36 2020 -0400

    centos6 doesn't use systemd

commit 6d87060
Merge: 79c9798 6b2a336
Author: Paul Miller <jettero@cpan.org>
Date:   Fri Mar 27 13:29:06 2020 -0400

    Merge pull request hubblestack#834 from jettero/4.0-sign-script

    4.0 sign script

commit 6b2a336
Author: Paul Miller <paul@jettero.pl>
Date:   Fri Mar 27 12:47:09 2020 -0400

    note to users

commit 776f0ac
Author: Paul Miller <paul@jettero.pl>
Date:   Fri Mar 27 12:44:12 2020 -0400

    a script to help quickly sign the right things

commit 7ca2b51
Author: Paul Miller <paul@jettero.pl>
Date:   Fri Mar 27 12:43:26 2020 -0400

    minor changes to whitespace and error logging

commit 2081ac2
Author: Paul Miller <paul@jettero.pl>
Date:   Fri Mar 27 12:04:40 2020 -0400

    this seems to test fine. meh

commit 8a11ac2
Author: Paul Miller <paul@jettero.pl>
Date:   Fri Mar 27 12:04:03 2020 -0400

    is there a problem with loading 25519 keys

commit 79c9798
Merge: 41fa0a2 4dc2328
Author: Paul Miller <jettero@cpan.org>
Date:   Tue Mar 24 12:47:27 2020 -0400

    Merge pull request hubblestack#824 from jettero/4.0-polishing-signing

    4.0 polishing signing

commit 4dc2328
Author: Paul Miller <paul@jettero.pl>
Date:   Thu Mar 19 10:10:05 2020 -0400

    I don't know why we're getting …

    … None for mfname and sfname, but we should handle it

commit 835dffb
Author: Paul Miller <paul@jettero.pl>
Date:   Thu Mar 19 09:56:14 2020 -0400

    there's more to prevent than an errant split

commit 60489c8
Author: Paul Miller <paul@jettero.pl>
Date:   Wed Mar 18 15:00:08 2020 -0400

    try to prevent logging related error

commit 41fa0a2
Merge: 82d4e86 dac7bae
Author: Paul Miller <jettero@cpan.org>
Date:   Tue Mar 24 12:31:55 2020 -0400

    Merge pull request hubblestack#828 from jettero/4.0-pulsar-fix

    4.0 pulsar fix

commit dac7bae
Author: Paul Miller <paul@jettero.pl>
Date:   Tue Mar 24 11:51:48 2020 -0400

    various minor fixes for dictionary keys that may be missing or empty

commit eeeeeea
Author: Paul Miller <paul@jettero.pl>
Date:   Tue Mar 24 11:20:46 2020 -0400

    teach mk-requires.sh to genreate teh same header every time

commit 82d4e86
Merge: 2fd4f76 f5cbe34
Author: Paul Miller <jettero@cpan.org>
Date:   Wed Mar 18 10:43:50 2020 -0400

    Merge pull request hubblestack#807 from jettero/4.0-pkg-fix

    4.0 pkg fix

commit f5cbe34
Author: Paul Miller <paul@jettero.pl>
Date:   Wed Mar 18 10:25:12 2020 -0400

    provide a method for listing the trusted certs

commit f2e31ce
Author: Paul Miller <paul@jettero.pl>
Date:   Wed Mar 18 10:24:59 2020 -0400

    tweak requirements and provide methods to generate it

commit 05a3c0d
Author: Paul Miller <paul@jettero.pl>
Date:   Tue Mar 17 14:29:17 2020 -0400

    forgot to copy this back to the dev/centos7

commit 1693261
Author: Paul Miller <paul@jettero.pl>
Date:   Fri Mar 13 15:38:54 2020 -0400

    man, str(as_pam was never going to be right

commit e923e4c
Author: Paul Miller <paul@jettero.pl>
Date:   Fri Mar 13 09:42:24 2020 -0400

    allow `obj = X509AwareCertBucket()` without args

commit 817adf3
Author: Paul Miller <paul@jettero.pl>
Date:   Thu Mar 12 15:18:53 2020 -0400

    minor py3 changes

commit 685787b
Author: Devansh Gupta <devagupt@adobe.com>
Date:   Wed Mar 11 11:01:21 2020 +0530

    Changing hubble git repo and version

commit 3e31253
Author: Devansh Gupta <devagupt@adobe.com>
Date:   Mon Mar 9 18:33:54 2020 +0530

    Moving old files to archived folder

commit a92bde7
Author: Devansh Gupta <devagupt@adobe.com>
Date:   Mon Mar 9 11:59:08 2020 +0530

    Removing pyinstaller-requirements.txt

commit 532546a
Author: Devansh Gupta <devagupt@adobe.com>
Date:   Mon Mar 9 11:57:54 2020 +0530

    Cleaning docker file

commit 22d91f6
Author: Devansh Gupta <devagupt@adobe.com>
Date:   Sun Mar 8 19:55:42 2020 +0530

    Docker file changes for Windows 4.0

commit 2b4bcf6
Author: Devansh Gupta <devagupt@adobe.com>
Date:   Sun Mar 8 17:58:54 2020 +0530

    Adding changes in setup and fixing pyinstaller version

commit cd003de
Author: Devansh Gupta <devagupt@adobe.com>
Date:   Sun Mar 8 15:11:30 2020 +0530

    Adding patch dependency

commit 7fd1fd8
Author: Devansh Gupta <devagupt@adobe.com>
Date:   Fri Mar 6 19:01:48 2020 +0530

    Adding dockerfile for win 4.0 changes

commit 87c7196
Author: Devansh Gupta <devagupt@adobe.com>
Date:   Fri Mar 6 18:56:39 2020 +0530

    Adding pyinstaller requirements

commit 86f9570
Author: Devansh Gupta <devagupt@adobe.com>
Date:   Fri Mar 6 18:43:09 2020 +0530

    Changes for windows 4.0 release

commit 4eac006
Author: Paul Miller <paul@jettero.pl>
Date:   Fri Mar 6 08:04:54 2020 -0500

    more travis things

commit 8423204
Author: Paul Miller <paul@jettero.pl>
Date:   Wed Mar 4 11:24:30 2020 -0500

    prepackage any prepackaged certs

commit 40922c9
Author: Paul Miller <paul@jettero.pl>
Date:   Sat Feb 29 08:32:07 2020 -0500

    tweak the build process to run a little faster

commit 9acc81f
Author: Paul Miller <paul@jettero.pl>
Date:   Fri Feb 28 12:14:36 2020 -0500

    fix salt.grains.core.get_server_id

commit 0dab3f4
Author: Paul Miller <paul@jettero.pl>
Date:   Mon Feb 17 12:09:56 2020 -0500

    flatten (re)pyinstaller

commit e3a1982
Author: Paul Miller <paul@jettero.pl>
Date:   Thu Mar 5 11:41:25 2020 -0500

    flatten efforts to fix the pkg/*/Dockerfiles

commit 2fd4f76
Merge: e7f6aec 6175b58
Author: Paul Miller <jettero@cpan.org>
Date:   Fri Mar 6 07:31:09 2020 -0500

    Merge pull request hubblestack#822 from jettero/4.0-pr815-fixes

    Minor fixes relating to PR815

commit 6175b58
Author: Paul Miller <paul@jettero.pl>
Date:   Thu Mar 5 11:46:13 2020 -0500

    forgot to set this string var apparently

commit 3681591
Author: Paul Miller <paul@jettero.pl>
Date:   Thu Mar 5 11:44:45 2020 -0500

    minor filehandle checking bug

commit 3cd23c1
Author: Paul Miller <paul@jettero.pl>
Date:   Thu Mar 5 11:41:25 2020 -0500

    a minor fix for a special case

    where the filename is actually the certificate string

commit e7f6aec
Merge: 72b5be0 a83d7f3
Author: Paul Miller <jettero@cpan.org>
Date:   Wed Mar 4 11:07:19 2020 -0500

    Merge pull request hubblestack#815 from git-gud-1/signing-logging

    Signing logging

commit 72b5be0
Merge: 408bc56 d91d1a2
Author: Paul Miller <jettero@cpan.org>
Date:   Wed Mar 4 11:06:24 2020 -0500

    Merge pull request hubblestack#817 from jettero/4.0-azure-py3-fix

    4.0 azure py3 fix and forward port of PR811

commit 408bc56
Merge: fb80333 1c8b8f5
Author: Paul Miller <jettero@cpan.org>
Date:   Wed Mar 4 11:05:58 2020 -0500

    Merge pull request hubblestack#818 from devagupt/4.0

    Adding exception handling in running schedules

commit 1c8b8f5
Merge: eeb9478 d53e705
Author: Devansh Gupta <devagupt@adobe.com>
Date:   Wed Mar 4 10:45:26 2020 +0530

    Merge branch '4.0' of https://github.com/devagupt/hubble into 4.0

commit eeb9478
Author: Devansh Gupta <devagupt@adobe.com>
Date:   Wed Mar 4 10:45:06 2020 +0530

    Adding exception handling in running schedules

commit d91d1a2
Author: Paul Miller <paul@jettero.pl>
Date:   Tue Mar 3 09:54:02 2020 -0500

    '1a1b1c'.decode('hex') is now …

    … bytes.fromhex('1a1b1c'); conveniently, already bytes for b64encode()

commit d53e705
Merge: 27cd4b3 fb80333
Author: Devansh Gupta <60506477+devagupt@users.noreply.github.com>
Date:   Sun Mar 1 00:19:48 2020 +0530

    Merge pull request hubblestack#6 from hubblestack/4.0

    4.0 sync up

commit 6c4b6e6
Author: Chandler Newby <chandler.newby@gmail.com>
Date:   Wed Feb 26 17:48:39 2020 -0700

    Filter bad host values on queue log messages

commit fb80333
Merge: bb3a80c 2aa7882
Author: Paul Miller <jettero@cpan.org>
Date:   Fri Feb 28 00:07:37 2020 -0500

    Merge pull request hubblestack#813 from jettero/4.0

    forward port 412bacc

commit 2aa7882
Author: DLC <ddelacru@adobe.com>
Date:   Wed Feb 26 19:33:52 2020 -0700

    Fix corrupted cache file

commit 27cd4b3
Merge: 765c16b bb3a80c
Author: Devansh Gupta <60506477+devagupt@users.noreply.github.com>
Date:   Tue Feb 25 14:42:12 2020 +0530

    Merge pull request hubblestack#4 from hubblestack/4.0

    4.0

commit a83d7f3
Author: git-gud-1 <danemorgan91@gmail.com>
Date:   Fri Feb 21 16:10:14 2020 -0700

    Fixed log formatting, linting issues, and unnessesary conditions. This commit checks verification status, controls how often output is sent to the returner, makes logging conditionals more succinct. Also gets rid of unused imports

commit 71df440
Author: git-gud-1 <danemorgan91@gmail.com>
Date:   Fri Feb 21 15:22:42 2020 -0700

    This commit keeps track of verification status, controls how often output is sent to the returner, makes logging conditionals more succinct. Also gets rid of unused imports

commit bb3a80c
Merge: d8db9c3 ee3ed1b
Author: Paul Miller <jettero@cpan.org>
Date:   Thu Feb 20 18:10:11 2020 -0500

    Merge pull request hubblestack#806 from jettero/4.0-cleanup

    this shouldn't be sitting in the root directory

commit d8db9c3
Merge: 28e4551 10660f0
Author: Paul Miller <jettero@cpan.org>
Date:   Thu Feb 20 18:09:53 2020 -0500

    Merge pull request hubblestack#808 from jettero/minor-typo

    some kind of conflict resolution typo most likely

commit 10660f0
Author: Paul Miller <paul@jettero.pl>
Date:   Wed Feb 19 14:45:09 2020 -0500

    some kind of conflict resolution typo most likely

commit ee3ed1b
Author: Paul Miller <paul@jettero.pl>
Date:   Wed Feb 19 09:36:59 2020 -0500

    this shouldn't be sitting in the root directory

commit 28e4551
Merge: 49c2956 4551ebf
Author: Paul Miller <jettero@cpan.org>
Date:   Mon Feb 17 16:51:13 2020 -0500

    Merge pull request hubblestack#802 from daveed12/patch-1

    Dictionary changed size during iteration fix

commit 4551ebf
Author: David <daveed12@users.noreply.github.com>
Date:   Mon Feb 17 12:52:01 2020 -0800

    Fix dictionary changed size during iteration error

commit 49c2956
Merge: 642922d 268f32a
Author: Paul Miller <jettero@cpan.org>
Date:   Thu Feb 13 12:40:45 2020 -0500

    Merge pull request hubblestack#801 from jettero/4.0

    bugs with the centos6 pyenv changes

commit 268f32a
Author: Paul Miller <paul@jettero.pl>
Date:   Wed Feb 12 21:14:54 2020 -0500

    bugs with the centos6 pyenv changes

commit 642922d
Merge: 1ced0fa e69bbf9
Author: Paul Miller <jettero@cpan.org>
Date:   Wed Feb 12 16:10:49 2020 -0500

    Merge pull request hubblestack#799 from jettero/4.0

    merge develop forward to 4.0 branch

commit e69bbf9
Merge: b4538f9 1ced0fa
Author: Paul Miller <paul@jettero.pl>
Date:   Wed Feb 12 11:01:58 2020 -0500

    Merge branch '4.0' of https://github.com/hubblestack/hubble into 4.0

    * '4.0' of https://github.com/hubblestack/hubble:
      remove second disable= and combine
      The problem is a missing docstring in __init__.py
      assume this file being empty is the main problem
      404 file not found...
      save and preserve the relevant-files.txt
      3.0.8 → 4.0.0
      move COPY pyinstaller-reqs down and fix a minor typo
      use pyenv and allow alt checkouts

commit 1ced0fa
Merge: 00e47d4 6fa1988
Author: Paul Miller <jettero@cpan.org>
Date:   Wed Feb 12 10:59:10 2020 -0500

    Merge pull request hubblestack#795 from jettero/use-pyenv

    use pyenv and allow alt checkouts

commit 6fa1988
Author: Paul Miller <paul@jettero.pl>
Date:   Wed Feb 12 10:56:35 2020 -0500

    remove second disable= and combine

commit f89f3ac
Author: Paul Miller <paul@jettero.pl>
Date:   Wed Feb 12 10:41:45 2020 -0500

    The problem is a missing docstring in __init__.py

commit 858e5b5
Author: Paul Miller <paul@jettero.pl>
Date:   Wed Feb 12 10:29:27 2020 -0500

    assume this file being empty is the main problem

commit 725565a
Author: Paul Miller <paul@jettero.pl>
Date:   Wed Feb 12 10:23:14 2020 -0500

    404 file not found...

    have to put the relevant-files.txt into output/ if we wish to
    keep it

commit 1fe6fb6
Author: Paul Miller <paul@jettero.pl>
Date:   Wed Feb 12 10:20:08 2020 -0500

    save and preserve the relevant-files.txt

commit 7954678
Author: Paul Miller <paul@jettero.pl>
Date:   Wed Feb 12 08:29:52 2020 -0500

    3.0.8 → 4.0.0

commit b4538f9
Merge: 00e47d4 811a525
Author: Paul Miller <paul@jettero.pl>
Date:   Wed Feb 12 08:25:15 2020 -0500

    Merge branch 'develop' into 4.0

    * develop:
      Adding step to move new dockerfile
      Adding support for TLS11 and TLS12
      Adding tls version upgrade in choco url
      deleting redundant file
      Pushing changes
      Adding hubble conf permission script
      Changing pygit2 version
      Basic signing for roots, s3fs and azurefs (untested)

commit 2f28452
Author: Paul Miller <paul@jettero.pl>
Date:   Fri Feb 7 15:08:00 2020 -0500

    move COPY pyinstaller-reqs down and fix a minor typo

commit 555e0c7
Author: Paul Miller <paul@jettero.pl>
Date:   Mon Feb 3 10:57:33 2020 -0500

    use pyenv and allow alt checkouts

commit 00e47d4
Merge: 765c16b d12652c
Author: Paul Miller <jettero@cpan.org>
Date:   Tue Feb 4 12:13:13 2020 -0500

    Merge pull request hubblestack#790 from jettero/onto-4.0

    s3-fix merge into 4.0 branch

commit d12652c
Author: Paul Miller <paul@jettero.pl>
Date:   Fri Jan 31 15:28:26 2020 -0500

    minor error message change (code review)

commit c3feaaa
Merge: 765c16b 654c293
Author: Paul Miller <paul@jettero.pl>
Date:   Thu Jan 30 14:30:46 2020 -0500

    Merge branch 'pr783' into onto-4.0

    * pr783:
      provide a way to mock a slowdown result
      proposed fix for pr783
      Cleaned _init()
      Handling other error codes as requested
      Cleaning up s3.py
      Getting that 100% on Pylint
      Dropped cache time to 30m
      S3 request rate limit fix
      fix minor clean-install bug with configfile permissions

commit 765c16b
Merge: 9ff90be e0e81dc
Author: Paul Miller <paul@jettero.pl>
Date:   Thu Jan 30 12:08:14 2020 -0500

    Merge branch 'py3' into develop

    * py3:
      make echo actually show information
      fix linting for hubble_status object
      various bad escape fixes
      pylint changes to make signing pass
      pylint changes
      let's make pylint non-optional
      not really py3 related test bugfixes
      logging is a built-in. It should not be in reqs
      still no good
      update jenkins test image
      avoid checking signatures on None type "files"
      minor fix for s3fs. Sometimes _init() gives None
      important bugfix for s3fs (binary pickles)
      fix minor clean-install bug with configfile permissions
      additional changes needed for py3 branch
      more python 3 changes needed — why in this merge though??
      Basic signing for roots, s3fs and azurefs (untested)
      fix error in sqlite returner
      add a few more options
      add args, byte dumps, pretty-print dumps, and colorized dumps
      This seems handy.
      clean up test for correctness
      some short names should just be short names
      add the tests for the current problem and fixes for it
      clean up test for correctness
      clean up test for pylint
      fix bug in hubblestack_nova/openssl.py caused by strptime
      fix py3 audit bug
      do the 3.6.10 thing
      test the hec obj a little more
      make some minor repairs to the hec.dq
      py3 is pickier about comparisons in sorted
      platform.linux_distribution & platform.dist replaced with distro
      Update nova_loader.py
      fix error when running hubble without -v
      remove unnecessary conversion to list
      change syntax to make it compatible with python 3
      do the 3.6.10 thing
      test the hec obj a little more
      make some minor repairs to the hec.dq
      py3 is pickier about comparisons in sorted
      fix audit file
      fix changes
      platform.linux_distribution & platform.dist replaced with distro
      Update nova_loader.py
      fix error when running hubble without -v
      remove unnecessary conversion to list
      change syntax to make it compatible with python 3

commit e0e81dc
Merge: b09a9d0 2f04e31
Author: Paul Miller <jettero@cpan.org>
Date:   Thu Jan 30 11:55:36 2020 -0500

    Merge pull request hubblestack#788 from jettero/py3-fixes

    various fixes to get py3 branch ready for 4.0 RC1

commit 2f04e31
Author: Paul Miller <paul@jettero.pl>
Date:   Thu Jan 30 11:52:48 2020 -0500

    make echo actually show information

commit 94b1b05
Author: Paul Miller <paul@jettero.pl>
Date:   Thu Jan 30 11:47:35 2020 -0500

    fix linting for hubble_status object

commit 26092f8
Author: Paul Miller <paul@jettero.pl>
Date:   Thu Jan 30 11:41:59 2020 -0500

    various bad escape fixes

commit e59af7a
Author: Paul Miller <paul@jettero.pl>
Date:   Thu Jan 30 11:38:25 2020 -0500

    pylint changes to make signing pass

commit cd879d9
Author: Paul Miller <paul@jettero.pl>
Date:   Thu Jan 30 11:14:54 2020 -0500

    pylint changes

commit 0d08c1e
Author: Paul Miller <paul@jettero.pl>
Date:   Thu Jan 30 11:10:50 2020 -0500

    let's make pylint non-optional

commit c7c9884
Author: Paul Miller <paul@jettero.pl>
Date:   Thu Jan 30 10:53:20 2020 -0500

    not really py3 related test bugfixes

commit 814fcd9
Author: Paul Miller <paul@jettero.pl>
Date:   Thu Jan 30 09:57:13 2020 -0500

    logging is a built-in. It should not be in reqs

commit 48e86ac
Author: Paul Miller <paul@jettero.pl>
Date:   Thu Jan 30 09:55:47 2020 -0500

    still no good

commit 13d8edd
Author: Paul Miller <paul@jettero.pl>
Date:   Thu Jan 30 09:24:31 2020 -0500

    update jenkins test image

commit fab17f2
Author: Paul Miller <paul@jettero.pl>
Date:   Thu Jan 30 08:41:14 2020 -0500

    avoid checking signatures on None type "files"

commit 5187f4c
Author: Paul Miller <paul@jettero.pl>
Date:   Thu Jan 30 08:40:40 2020 -0500

    minor fix for s3fs. Sometimes _init() gives None

commit 57c5e2d
Author: Paul Miller <paul@jettero.pl>
Date:   Thu Jan 30 09:15:36 2020 -0500

    important bugfix for s3fs (binary pickles)

commit b09a9d0
Merge: a6c891a fc26f55
Author: Tenebriso <emilia.voicu95@gmail.com>
Date:   Wed Jan 29 16:50:22 2020 +0200

    Merge pull request hubblestack#780 from jettero/py3-data-sign

    data sign [py3 rebase] and some additional merge forward

commit a6c891a
Merge: d443d99 29d84cc
Author: Tenebriso <emilia.voicu95@gmail.com>
Date:   Wed Jan 29 13:50:27 2020 +0200

    Merge pull request hubblestack#785 from jettero/384-fileperms

    fix minor clean-install bug with configfile permissions

commit 29d84cc
Author: Paul Miller <paul@jettero.pl>
Date:   Tue Jan 28 07:23:09 2020 -0500

    fix minor clean-install bug with configfile permissions

commit fc26f55
Author: Paul Miller <paul@jettero.pl>
Date:   Mon Jan 27 10:47:48 2020 -0500

    additional changes needed for py3 branch

commit 532bfd9
Author: Paul Miller <paul@jettero.pl>
Date:   Mon Jan 27 10:37:37 2020 -0500

    more python 3 changes needed — why in this merge though??

commit e09e470
Author: Paul Miller <paul@jettero.pl>
Date:   Tue Aug 6 08:43:59 2019 -0400

    Basic signing for roots, s3fs and azurefs (untested)

    (flatten 50 commits)

commit 1a8d415
Author: Emilia Voicu <emilia.voicu95@gmail.com>
Date:   Wed Jan 22 13:31:17 2020 +0000

    fix error in sqlite returner

commit a11cdb0
Author: Paul Miller <paul@jettero.pl>
Date:   Wed Jan 15 11:26:26 2020 -0500

    add a few more options

commit 447bb2e
Author: Paul Miller <paul@jettero.pl>
Date:   Thu May 23 10:41:18 2019 -0400

    add args, byte dumps, pretty-print dumps, and colorized dumps

    Though, it's worth noting that disk-queue-info.py -pec does nothing
    that the following wouldn't do faster:

    disk-queue-info.py | jq -C .

commit 354eb40
Author: Paul Miller <paul@jettero.pl>
Date:   Thu May 23 09:05:41 2019 -0400

    This seems handy.

commit f670dd3
Author: Paul Miller <paul@jettero.pl>
Date:   Wed Jan 1 10:58:27 2020 -0500

    clean up test for correctness

commit 9d4dbc2
Author: Paul Miller <paul@jettero.pl>
Date:   Wed Jan 1 09:39:29 2020 -0500

    some short names should just be short names

commit d443d99
Merge: f027edf 5e30e1c
Author: Tenebriso <emilia.voicu95@gmail.com>
Date:   Wed Jan 22 15:34:53 2020 +0200

    Merge pull request hubblestack#781 from jettero/py3-fim-single-file

    fim single file [py3 rebase]

commit f027edf
Merge: 8687632 f0c1e84
Author: Tenebriso <emilia.voicu95@gmail.com>
Date:   Thu Jan 16 13:22:00 2020 +0200

    Merge pull request hubblestack#778 from Tenebriso/nova_openssl_bug

    fix bug in hubblestack_nova/openssl.py [py3]

commit 5e30e1c
Author: Paul Miller <paul@jettero.pl>
Date:   Wed Jan 1 12:56:17 2020 -0500

    add the tests for the current problem and fixes for it

commit fdc0b0f
Author: Paul Miller <paul@jettero.pl>
Date:   Wed Jan 1 10:58:27 2020 -0500

    clean up test for correctness

commit 7656d3f
Author: Paul Miller <paul@jettero.pl>
Date:   Wed Jan 1 09:51:09 2020 -0500

    clean up test for pylint

commit f0c1e84
Author: Tenebriso <evoicu@adobe.com>
Date:   Wed Jan 15 12:27:31 2020 +0200

    fix bug in hubblestack_nova/openssl.py caused by strptime

commit 8687632
Merge: 1204850 bae01b3
Author: Tenebriso <emilia.voicu95@gmail.com>
Date:   Fri Jan 10 17:12:33 2020 +0200

    Merge pull request hubblestack#777 from Tenebriso/audit_bug

    fix py3 audit bug

commit bae01b3
Author: Tenebriso <evoicu@adobe.com>
Date:   Fri Jan 10 13:59:11 2020 +0200

    fix py3 audit bug

commit 1204850
Merge: 1f455dc 267eaae
Author: Tenebriso <emilia.voicu95@gmail.com>
Date:   Fri Jan 10 13:28:31 2020 +0200

    Merge pull request hubblestack#775 from Tenebriso/py3_merge_fix

    rebase py3 onto develop and fix the merge conflicts

commit 267eaae
Merge: 8dfe247 1f455dc
Author: Tenebriso <emilia.voicu95@gmail.com>
Date:   Mon Jan 6 18:56:32 2020 +0200

    Merge branch 'py3' into py3_merge_fix

commit 8dfe247
Author: Paul Miller <paul@jettero.pl>
Date:   Sun Jan 5 19:45:25 2020 -0500

    do the 3.6.10 thing

commit c51692f
Author: Paul Miller <paul@jettero.pl>
Date:   Sun Jan 5 19:16:03 2020 -0500

    test the hec obj a little more

commit e56a74f
Author: Paul Miller <paul@jettero.pl>
Date:   Sun Jan 5 11:08:48 2020 -0500

    make some minor repairs to the hec.dq

commit d332ea5
Author: Paul Miller <paul@jettero.pl>
Date:   Sun Jan 5 10:34:12 2020 -0500

    py3 is pickier about comparisons in sorted

commit 87e3f36
Author: root <root@localhost.localdomain>
Date:   Tue Dec 3 17:25:53 2019 -0700

    platform.linux_distribution & platform.dist replaced with distro

commit 9096efc
Author: Massimiliano Cuzzoli <mcuzzoli@gmail.com>
Date:   Tue Nov 26 15:34:02 2019 +0100

    Update nova_loader.py

commit 5a04cf1
Author: Emilia Voicu <emilia.voicu95@gmail.com>
Date:   Mon Nov 11 15:53:24 2019 +0000

    fix error when running hubble without -v

commit 3d42bca
Author: Emilia Voicu <emilia.voicu95@gmail.com>
Date:   Tue Oct 22 15:49:33 2019 +0000

    remove unnecessary conversion to list

commit 5880645
Author: Emilia Voicu <emilia.voicu95@gmail.com>
Date:   Mon Oct 21 16:14:18 2019 +0000

    change syntax to make it compatible with python 3

commit 1f455dc
Merge: 9802ad1 2ac4013
Author: Tenebriso <emilia.voicu95@gmail.com>
Date:   Mon Jan 6 13:58:38 2020 +0200

    Merge pull request hubblestack#773 from jettero/fix-py3-hec-dq

    Fix py3 hec dq

commit 2ac4013
Author: Paul Miller <paul@jettero.pl>
Date:   Sun Jan 5 19:45:25 2020 -0500

    do the 3.6.10 thing

commit e6b032b
Author: Paul Miller <paul@jettero.pl>
Date:   Sun Jan 5 19:16:03 2020 -0500

    test the hec obj a little more

commit 6400e61
Author: Paul Miller <paul@jettero.pl>
Date:   Sun Jan 5 11:08:48 2020 -0500

    make some minor repairs to the hec.dq

commit 8cd07f4
Author: Paul Miller <paul@jettero.pl>
Date:   Sun Jan 5 10:34:12 2020 -0500

    py3 is pickier about comparisons in sorted

commit 9802ad1
Merge: 277b958 a0d94e7
Author: Paul Miller <jettero@cpan.org>
Date:   Wed Jan 1 10:34:15 2020 -0500

    Merge pull request hubblestack#762 from Tenebriso/python3

    rebase & convert changes

commit a0d94e7
Author: Emilia Voicu <emilia.voicu95@gmail.com>
Date:   Wed Dec 18 16:33:13 2019 +0000

    fix audit file

commit 47e3b98
Author: Emilia Voicu <emilia.voicu95@gmail.com>
Date:   Wed Dec 18 16:28:25 2019 +0000

    fix changes

commit ab17307
Merge: 447ce8e 277b958
Author: Emilia Voicu <emilia.voicu95@gmail.com>
Date:   Tue Dec 17 13:04:08 2019 +0000

    Merge branch 'py3' of https://github.com/hubblestack/hubble into python3

commit 447ce8e
Merge: b015f68 94de08b
Author: Emilia Voicu <emilia.voicu95@gmail.com>
Date:   Tue Dec 17 13:02:19 2019 +0000

    Merge branch 'develop' of https://github.com/hubblestack/hubble into python3

commit 277b958
Merge: b95fba0 203fb68
Author: Tenebriso <emilia.voicu95@gmail.com>
Date:   Fri Dec 6 15:05:16 2019 +0200

    Merge pull request hubblestack#754 from daveed12/py3

    platform.linux_distribution() & platform.dist() replaced with distro.linux_distribution()

commit 203fb68
Author: root <root@localhost.localdomain>
Date:   Tue Dec 3 17:25:53 2019 -0700

    platform.linux_distribution & platform.dist replaced with distro

commit b95fba0
Merge: 4cef888 e97a214
Author: Tenebriso <emilia.voicu95@gmail.com>
Date:   Wed Dec 4 15:28:44 2019 +0200

    Merge pull request hubblestack#747 from Massi78/py3_fix

    Update nova_loader.py

commit e97a214
Author: Massimiliano Cuzzoli <mcuzzoli@gmail.com>
Date:   Tue Nov 26 15:34:02 2019 +0100

    Update nova_loader.py

commit 4cef888
Merge: 3176111 e866068
Author: Paul Miller <jettero@cpan.org>
Date:   Tue Nov 19 14:11:30 2019 -0500

    Merge pull request hubblestack#732 from Tenebriso/python3

    change syntax to make it compatible with python 3

commit b015f68
Merge: e866068 bb5027d
Author: Emilia Voicu <emilia.voicu95@gmail.com>
Date:   Mon Nov 11 16:17:59 2019 +0000

    Merge branch 'develop' of https://github.com/hubblestack/hubble into python3

commit e866068
Author: Emilia Voicu <emilia.voicu95@gmail.com>
Date:   Mon Nov 11 15:53:24 2019 +0000

    fix error when running hubble without -v

commit c445d12
Author: Emilia Voicu <emilia.voicu95@gmail.com>
Date:   Tue Oct 22 15:49:33 2019 +0000

    remove unnecessary conversion to list

commit f25c58b
Author: Emilia Voicu <emilia.voicu95@gmail.com>
Date:   Mon Oct 21 16:14:18 2019 +0000

    change syntax to make it compatible with python 3
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jettero jettero Awaiting requested review from jettero

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Tenebriso @daveed12 @jettero @Massi78