Python: Bit too eager with the modernisation...

yoff · yoff · commit 178cb6c90faa · 2021-04-13T11:26:05.000+02:00
Lift type restrictions to recover results.
diff --git a/python/ql/src/Security/CWE-327/Ssl.qll b/python/ql/src/Security/CWE-327/Ssl.qll
@@ -45,7 +45,7 @@ class WrapSocketCall extends ConnectionCreation, DataFlow::CallCfgNode {
   }
 }
 
-class OptionsAugOr extends ProtocolRestriction, DataFlow::CallCfgNode {
+class OptionsAugOr extends ProtocolRestriction, DataFlow::CfgNode {
   ProtocolVersion restriction;
 
   OptionsAugOr() {
@@ -68,7 +68,7 @@ class OptionsAugOr extends ProtocolRestriction, DataFlow::CallCfgNode {
   override ProtocolVersion getRestriction() { result = restriction }
 }
 
-class OptionsAugAndNot extends ProtocolUnrestriction, DataFlow::CallCfgNode {
+class OptionsAugAndNot extends ProtocolUnrestriction, DataFlow::CfgNode {
   ProtocolVersion restriction;
 
   OptionsAugAndNot() {
@@ -126,7 +126,7 @@ predicate impliesBitSet(BinaryExpr whole, Expr part, boolean partHasBitSet, bool
   )
 }
 
-class ContextSetVersion extends ProtocolRestriction, ProtocolUnrestriction, DataFlow::CallCfgNode {
+class ContextSetVersion extends ProtocolRestriction, ProtocolUnrestriction, DataFlow::CfgNode {
   ProtocolVersion restriction;
 
   ContextSetVersion() {

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ class WrapSocketCall extends ConnectionCreation, DataFlow::CallCfgNode {`
`45`	`45`	`}`
`46`	`46`	`}`
`47`	`47`
`48`		`-class OptionsAugOr extends ProtocolRestriction, DataFlow::CallCfgNode {`
	`48`	`+class OptionsAugOr extends ProtocolRestriction, DataFlow::CfgNode {`
`49`	`49`	`ProtocolVersion restriction;`
`50`	`50`
`51`	`51`	`OptionsAugOr() {`
`@@ -68,7 +68,7 @@ class OptionsAugOr extends ProtocolRestriction, DataFlow::CallCfgNode {`
`68`	`68`	`override ProtocolVersion getRestriction() { result = restriction }`
`69`	`69`	`}`
`70`	`70`
`71`		`-class OptionsAugAndNot extends ProtocolUnrestriction, DataFlow::CallCfgNode {`
	`71`	`+class OptionsAugAndNot extends ProtocolUnrestriction, DataFlow::CfgNode {`
`72`	`72`	`ProtocolVersion restriction;`
`73`	`73`
`74`	`74`	`OptionsAugAndNot() {`
`@@ -126,7 +126,7 @@ predicate impliesBitSet(BinaryExpr whole, Expr part, boolean partHasBitSet, bool`
`126`	`126`	`)`
`127`	`127`	`}`
`128`	`128`
`129`		`-class ContextSetVersion extends ProtocolRestriction, ProtocolUnrestriction, DataFlow::CallCfgNode {`
	`129`	`+class ContextSetVersion extends ProtocolRestriction, ProtocolUnrestriction, DataFlow::CfgNode {`
`130`	`130`	`ProtocolVersion restriction;`
`131`	`131`
`132`	`132`	`ContextSetVersion() {`