+
Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: OWASP/pytm
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.3.0
Choose a base ref
...
head repository: OWASP/pytm
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v1.3.1
Choose a head ref
  • 12 commits
  • 4 files changed
  • 4 contributors

Commits on Mar 13, 2024

  1. Added a first draft for #234

    In #234 @colesmj suggested to move the import of pydal into the sqlDumb
    function.
    This commit does this and if the import fails raises an UIError with an
    explanation on how to proceed.
    The text is just a first draft.
    
    To move the import the function get_table was also moved inside the
    sqlDump function.
    raphaelahrens committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    a53b3fd View commit details
    Browse the repository at this point in the history
  2. Merge pull request #235 from raphaelahrens/master

    Added a first draft for #234
    izar authored Mar 13, 2024
    Configuration menu
    Copy the full SHA
    c4a81a4 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2024

  1. updating versions

    izar committed Mar 21, 2024
    Configuration menu
    Copy the full SHA
    dafc08f View commit details
    Browse the repository at this point in the history
  2. Update scorecard.yml

    updating breaking version of OSS scorecard-action
    izar authored Mar 21, 2024
    Configuration menu
    Copy the full SHA
    424f5d7 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #236 from izar/izar-patch-4

    Update scorecard.yml
    colesmj authored Mar 21, 2024
    Configuration menu
    Copy the full SHA
    8f57ca9 View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2024

  1. first draft

    izar committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    f868ffd View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2024

  1. Added prerequisites and likelihood to Threat

    In threats.json the two properties ("prerequisites", "Likelihood Of Attack") are defined, but are not used in the
    rest of pytm.
    
    This commit adds the two properties to the Threat class, so they can be
    used by other parts of pytm.
    
    For me this was relevant, since I started to experiment with a different
    format for threats mentioned in #237 .
    And after exporting threat.json to a markdown format and back into
    threat.json these two fields where missing.
    raphaelahrens committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    bd363e9 View commit details
    Browse the repository at this point in the history
  2. Update README.md with movie

    Demo-ing the reveal template.
    izar authored Apr 12, 2024
    Configuration menu
    Copy the full SHA
    1295915 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #241 from raphaelahrens/master

    Added `prerequisites` and `likelihood` to Threat
    izar authored Apr 12, 2024
    Configuration menu
    Copy the full SHA
    6ca9f75 View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2024

  1. Fixed #221 Got an error "AttributeError: 'str' ...

    When pytm was run with the `--sqldump` flag with the example `tm.py` from
    the repository the execution failed with
    
    ```
    AttributeError: 'str' object has no attribute 'name'"
    ```
    
    This was caused by the `assumptions` attribute
    https://github.com/izar/pytm/blob/6ca9f75ddaa5bda3503a6b8cbce5e6700e03e644/tm.py#L20-L22
    
    When dumping the model into the database all attributes of the TM class are turned into
    strings, by first turning the obj into a dictionary, where specific
    attributes are removed and some are converted, and then each value in
    the dictionary are turned into strings.
    
    This filtering and conversion is done by the `serilaize(obj, nested=False)` function.
    `sqlDump` transforms the values into strings.
    
    The problem in #221 was that when `nested` is false the default behavior
    of `serialize()` is to assume that any list of values holds objects which
    have either a `.name` or are an instance of `Finding`.
    Since `assumptions` is a list of strings this fails.
    
    The fix was to add `assumptions` to an already existing check for
    similar attributes.
    Also the check was changed from `i == x or ...` to an `in` check.
    
    But to be honest this code is very complex and holds many assumptions,
    which are not true for all classes and is constantly checking the
    type of the class.
    Maybe it would be best to write specific serialize functions for some
    classes, and only have a genral serialize function which takes in an
    object and a blacklist of attributes.
    The `to_serializable` singledispatch function already crates special
    functions for each class for the JSON conversion, maybe this can be
    extended.
    raphaelahrens committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    9c90a25 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #242 from raphaelahrens/master

    Fixed #221 Got an error "AttributeError: 'str' ...
    izar authored Apr 18, 2024
    Configuration menu
    Copy the full SHA
    03a4747 View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2024

  1. Merge pull request #240 from izar/revealjs

    Revealjs & update scorecard action version
    colesmj authored Apr 20, 2024
    Configuration menu
    Copy the full SHA
    b0c4388 View commit details
    Browse the repository at this point in the history
Loading
点击 这是indexloc提供的php浏览器服务,不要输入任何密码和下载