Skip to content

Fixed json load for Controls and added test data to input.json #252

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed json load for Controls and added test data to input.json #252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 8 additions & 2 deletions pytm/pytm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,11 +261,17 @@ def __str__(self):

class varControls(var):
def __set__(self, instance, value):
if not isinstance(value, Controls):
if isinstance(value, dict):
for i in value:
Controls()._safeset(i, value[i])

elif isinstance(value, Controls):
super().__set__(instance, value)

elif not isinstance(value, Controls):
raise ValueError(
f"expecting an Controls value, got a {type(value)}"
)
super().__set__(instance, value)


class varAssumptions(var):
Expand Down
47 changes: 46 additions & 1 deletion tests/input.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,52 @@
"onDuplicates": "IGNORE",
"boundaries": [
{
"name": "Internet"
"name": "Internet",
"controls": {
"authenticatesDestination": false,
"authenticatesSource": false,
"authenticationScheme": "",
"authorizesSource": false,
"checksDestinationRevocation": false,
"checksInputBounds": false,
"definesConnectionTimeout": false,
"disablesDTD": false,
"disablesiFrames": false,
"encodesHeaders": false,
"encodesOutput": false,
"encryptsCookies": false,
"encryptsSessionData": false,
"handlesCrashes": false,
"handlesInterruptions": false,
"handlesResourceConsumption": false,
"hasAccessControl": false,
"implementsAuthenticationScheme": false,
"implementsCSRFToken": false,
"implementsNonce": false,
"implementsPOLP": false,
"implementsServerSideValidation": false,
"implementsStrictHTTPValidation": false,
"invokesScriptFilters": false,
"isEncrypted": false,
"isEncryptedAtRest": false,
"isHardened": false,
"isResilient": false,
"providesConfidentiality": false,
"providesIntegrity": false,
"sanitizesInput": false,
"tracksExecutionFlow": false,
"usesCodeSigning": false,
"usesEncryptionAlgorithm": "",
"usesMFA": false,
"usesParameterizedInput": false,
"usesSecureFunctions": false,
"usesStrongSessionIdentifiers": false,
"usesVPN": false,
"validatesContentType": false,
"validatesHeaders": false,
"validatesInput": false,
"verifySessionIdentifiers": false
}
},
{
"name": "Server/DB"
Expand Down