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

rework nested boundaries #55

Merged
merged 3 commits into from
Nov 7, 2019
Merged

rework nested boundaries #55

merged 3 commits into from
Nov 7, 2019

Conversation

redshiftzero
Copy link
Contributor

In #54 @jdcallet reports an issue with nested boundaries: all boundaries are being nested in the order they're defined. This PR builds on their fix taking the approach described here.

I've tested this on a more complicated threat model example and the boundaries are rendering as expected in the nested/non-nested case (the PNGs are huge so not attaching here, but one can test for themselves via ./sd.py --debug --dfd | dot -Tpng -o dfd both on master and on this branch).

@redshiftzero redshiftzero requested a review from izar as a code owner November 7, 2019 16:14
@ghost
Copy link

ghost commented Nov 7, 2019

DeepCode Report (#7bef12)

DeepCode analyzed this pull request.
There are no new issues.

@redshiftzero
Copy link
Contributor Author

redshiftzero commented Nov 7, 2019

want me to rebase out the commit from @jdcallet I cherry picked in here? (to resolve the conflicts)

@izar izar merged commit 3c7373d into OWASP:master Nov 7, 2019
@izar
Copy link
Collaborator

izar commented Nov 7, 2019

Yup, looks good from my side, could you please test and confirm?

@redshiftzero
Copy link
Contributor Author

yep, just tested latest master, all looks good

@izar
Copy link
Collaborator

izar commented Nov 7, 2019

Great, pushing to Pypi, thanks a lot to you and @jdcallet !

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants