Swift: Autoformat

This commit is contained in:
Anders Schack-Mulligen
2023-02-17 12:27:10 +01:00
parent 08c658e66b
commit 711d7057f7
30 changed files with 90 additions and 46 deletions

View File

@@ -1,4 +1,4 @@
private import codeql.swift.generated.expr.DifferentiableFunctionExtractOriginalExpr
class DifferentiableFunctionExtractOriginalExpr extends Generated::DifferentiableFunctionExtractOriginalExpr {
}
class DifferentiableFunctionExtractOriginalExpr extends Generated::DifferentiableFunctionExtractOriginalExpr
{ }

View File

@@ -44,7 +44,8 @@ private class CollectionSummaries extends SummaryModelCsv {
* tainted.
*/
private class CollectionFieldsInheritTaint extends TaintInheritingContent,
DataFlow::Content::FieldContent {
DataFlow::Content::FieldContent
{
CollectionFieldsInheritTaint() {
exists(FieldDecl f | this.getField() = f |
(

View File

@@ -70,7 +70,8 @@ private class LaunchOptionsUrlVarDecl extends VarDecl {
* A content implying that, if a `UIOpenURLContext` is tainted, then its field `url` is also tainted.
*/
private class UiOpenUrlContextUrlInheritTaint extends TaintInheritingContent,
DataFlow::Content::FieldContent {
DataFlow::Content::FieldContent
{
UiOpenUrlContextUrlInheritTaint() {
this.getField().getEnclosingDecl().(NominalTypeDecl).getName() = "UIOpenURLContext" and
this.getField().getName() = "url"
@@ -81,7 +82,8 @@ private class UiOpenUrlContextUrlInheritTaint extends TaintInheritingContent,
* A content implying that, if a `NSUserActivity` is tainted, then its field `webpageURL` is also tainted.
*/
private class UserActivityUrlInheritTaint extends TaintInheritingContent,
DataFlow::Content::FieldContent {
DataFlow::Content::FieldContent
{
UserActivityUrlInheritTaint() {
this.getField().getEnclosingDecl().(NominalTypeDecl).getName() = "NSUserActivity" and
this.getField().getName() = "webpageURL"
@@ -93,7 +95,8 @@ private class UserActivityUrlInheritTaint extends TaintInheritingContent,
* `userActivities` and `urlContexts` are also tainted.
*/
private class ConnectionOptionsFieldsInheritTaint extends TaintInheritingContent,
DataFlow::Content::FieldContent {
DataFlow::Content::FieldContent
{
ConnectionOptionsFieldsInheritTaint() {
this.getField().getEnclosingDecl().(NominalTypeDecl).getName() = "ConnectionOptions" and
this.getField().getName() = ["userActivities", "urlContexts"]

View File

@@ -83,7 +83,8 @@ private class NsDataTaintedFields extends TaintInheritingContent, DataFlow::Cont
/** A content implying that, if a `NSMutableData` object is tainted, some of its fields are also tainted. */
private class NsMutableDataTaintedFields extends TaintInheritingContent,
DataFlow::Content::FieldContent {
DataFlow::Content::FieldContent
{
NsMutableDataTaintedFields() {
exists(FieldDecl f | this.getField() = f |
f.getEnclosingDecl() instanceof NsMutableData and

View File

@@ -129,7 +129,8 @@ private class NsStringSummaries extends SummaryModelCsv {
* tainted.
*/
private class NsStringFieldsInheritTaint extends TaintInheritingContent,
DataFlow::Content::FieldContent {
DataFlow::Content::FieldContent
{
NsStringFieldsInheritTaint() {
exists(FieldDecl f | this.getField() = f |
(

View File

@@ -34,7 +34,8 @@ private class SequenceSummaries extends SummaryModelCsv {
* tainted.
*/
private class SequenceFieldsInheritTaint extends TaintInheritingContent,
DataFlow::Content::FieldContent {
DataFlow::Content::FieldContent
{
SequenceFieldsInheritTaint() {
exists(FieldDecl f | this.getField() = f |
(

View File

@@ -121,7 +121,8 @@ private class StringSummaries extends SummaryModelCsv {
* tainted. This also includes fields declared in `StringProtocol`.
*/
private class StringFieldsInheritTaint extends TaintInheritingContent,
DataFlow::Content::FieldContent {
DataFlow::Content::FieldContent
{
StringFieldsInheritTaint() {
exists(FieldDecl f | this.getField() = f |
(

View File

@@ -24,7 +24,8 @@ private class UriFieldsInheritTaint extends TaintInheritingContent, DataFlow::Co
* `httpBodyStream`, `mainDocument` and `allHTTPHeaderFields` are tainted.
*/
private class UrlRequestFieldsInheritTaint extends TaintInheritingContent,
DataFlow::Content::FieldContent {
DataFlow::Content::FieldContent
{
UrlRequestFieldsInheritTaint() {
this.getField().getEnclosingDecl().(NominalTypeDecl).getName() = "URLRequest" and
this.getField().getName() =

View File

@@ -28,7 +28,8 @@ private class WKScriptMessageDecl extends ClassDecl {
* A content implying that, if a `WKScriptMessage` is tainted, its `body` field is tainted.
*/
private class WKScriptMessageBodyInheritsTaint extends TaintInheritingContent,
DataFlow::Content::FieldContent {
DataFlow::Content::FieldContent
{
WKScriptMessageBodyInheritsTaint() {
exists(FieldDecl f | this.getField() = f |
f.getEnclosingDecl() instanceof WKScriptMessageDecl and
@@ -206,7 +207,8 @@ private class WKUserScriptSummaries extends SummaryModelCsv {
* A content implying that, if a `WKUserScript` is tainted, its `source` field is tainted.
*/
private class WKUserScriptInheritsTaint extends TaintInheritingContent,
DataFlow::Content::FieldContent {
DataFlow::Content::FieldContent
{
WKUserScriptInheritsTaint() {
exists(FieldDecl f | this.getField() = f |
f.getEnclosingDecl().(ClassOrStructDecl).getName() = "WKUserScript" and

View File

@@ -8,7 +8,8 @@ module Generated {
* An availability spec based on platform and version, for example `macOS 12` or `watchOS 14`
*/
class PlatformVersionAvailabilitySpec extends Synth::TPlatformVersionAvailabilitySpec,
AvailabilitySpec {
AvailabilitySpec
{
override string getAPrimaryQlClass() { result = "PlatformVersionAvailabilitySpec" }
/**

View File

@@ -90,7 +90,8 @@ module Raw {
}
class PlatformVersionAvailabilitySpec extends @platform_version_availability_spec,
AvailabilitySpec {
AvailabilitySpec
{
override string toString() { result = "PlatformVersionAvailabilitySpec" }
string getPlatform() { platform_version_availability_specs(this, result, _) }
@@ -776,22 +777,26 @@ module Raw {
}
class CollectionUpcastConversionExpr extends @collection_upcast_conversion_expr,
ImplicitConversionExpr {
ImplicitConversionExpr
{
override string toString() { result = "CollectionUpcastConversionExpr" }
}
class ConditionalBridgeFromObjCExpr extends @conditional_bridge_from_obj_c_expr,
ImplicitConversionExpr {
ImplicitConversionExpr
{
override string toString() { result = "ConditionalBridgeFromObjCExpr" }
}
class CovariantFunctionConversionExpr extends @covariant_function_conversion_expr,
ImplicitConversionExpr {
ImplicitConversionExpr
{
override string toString() { result = "CovariantFunctionConversionExpr" }
}
class CovariantReturnConversionExpr extends @covariant_return_conversion_expr,
ImplicitConversionExpr {
ImplicitConversionExpr
{
override string toString() { result = "CovariantReturnConversionExpr" }
}
@@ -814,7 +819,8 @@ module Raw {
}
class DifferentiableFunctionExtractOriginalExpr extends @differentiable_function_extract_original_expr,
ImplicitConversionExpr {
ImplicitConversionExpr
{
override string toString() { result = "DifferentiableFunctionExtractOriginalExpr" }
}
@@ -829,7 +835,8 @@ module Raw {
}
class ExistentialMetatypeToObjectExpr extends @existential_metatype_to_object_expr,
ImplicitConversionExpr {
ImplicitConversionExpr
{
override string toString() { result = "ExistentialMetatypeToObjectExpr" }
}
@@ -876,12 +883,14 @@ module Raw {
}
class LinearFunctionExtractOriginalExpr extends @linear_function_extract_original_expr,
ImplicitConversionExpr {
ImplicitConversionExpr
{
override string toString() { result = "LinearFunctionExtractOriginalExpr" }
}
class LinearToDifferentiableFunctionExpr extends @linear_to_differentiable_function_expr,
ImplicitConversionExpr {
ImplicitConversionExpr
{
override string toString() { result = "LinearToDifferentiableFunctionExpr" }
}
@@ -944,7 +953,8 @@ module Raw {
}
class ProtocolMetatypeToObjectExpr extends @protocol_metatype_to_object_expr,
ImplicitConversionExpr {
ImplicitConversionExpr
{
override string toString() { result = "ProtocolMetatypeToObjectExpr" }
}
@@ -995,12 +1005,14 @@ module Raw {
}
class UnresolvedMemberChainResultExpr extends @unresolved_member_chain_result_expr, IdentityExpr,
ErrorElement {
ErrorElement
{
override string toString() { result = "UnresolvedMemberChainResultExpr" }
}
class UnresolvedTypeConversionExpr extends @unresolved_type_conversion_expr,
ImplicitConversionExpr, ErrorElement {
ImplicitConversionExpr, ErrorElement
{
override string toString() { result = "UnresolvedTypeConversionExpr" }
}
@@ -1495,7 +1507,8 @@ module Raw {
}
class NominalOrBoundGenericNominalType extends @nominal_or_bound_generic_nominal_type,
AnyGenericType { }
AnyGenericType
{ }
class ParenType extends @paren_type, SugarType {
override string toString() { result = "ParenType" }

View File

@@ -7,5 +7,6 @@ import codeql.swift.elements.decl.ValueDecl
module Generated {
class AbstractFunctionDecl extends Synth::TAbstractFunctionDecl, GenericContext, ValueDecl,
Callable { }
Callable
{ }
}

View File

@@ -5,7 +5,8 @@ import codeql.swift.elements.expr.ImplicitConversionExpr
module Generated {
class CollectionUpcastConversionExpr extends Synth::TCollectionUpcastConversionExpr,
ImplicitConversionExpr {
ImplicitConversionExpr
{
override string getAPrimaryQlClass() { result = "CollectionUpcastConversionExpr" }
}
}

View File

@@ -5,7 +5,8 @@ import codeql.swift.elements.expr.ImplicitConversionExpr
module Generated {
class ConditionalBridgeFromObjCExpr extends Synth::TConditionalBridgeFromObjCExpr,
ImplicitConversionExpr {
ImplicitConversionExpr
{
override string getAPrimaryQlClass() { result = "ConditionalBridgeFromObjCExpr" }
}
}

View File

@@ -5,7 +5,8 @@ import codeql.swift.elements.expr.ImplicitConversionExpr
module Generated {
class CovariantFunctionConversionExpr extends Synth::TCovariantFunctionConversionExpr,
ImplicitConversionExpr {
ImplicitConversionExpr
{
override string getAPrimaryQlClass() { result = "CovariantFunctionConversionExpr" }
}
}

View File

@@ -5,7 +5,8 @@ import codeql.swift.elements.expr.ImplicitConversionExpr
module Generated {
class CovariantReturnConversionExpr extends Synth::TCovariantReturnConversionExpr,
ImplicitConversionExpr {
ImplicitConversionExpr
{
override string getAPrimaryQlClass() { result = "CovariantReturnConversionExpr" }
}
}

View File

@@ -5,7 +5,8 @@ import codeql.swift.elements.expr.ImplicitConversionExpr
module Generated {
class DifferentiableFunctionExpr extends Synth::TDifferentiableFunctionExpr,
ImplicitConversionExpr {
ImplicitConversionExpr
{
override string getAPrimaryQlClass() { result = "DifferentiableFunctionExpr" }
}
}

View File

@@ -5,7 +5,8 @@ import codeql.swift.elements.expr.ImplicitConversionExpr
module Generated {
class DifferentiableFunctionExtractOriginalExpr extends Synth::TDifferentiableFunctionExtractOriginalExpr,
ImplicitConversionExpr {
ImplicitConversionExpr
{
override string getAPrimaryQlClass() { result = "DifferentiableFunctionExtractOriginalExpr" }
}
}

View File

@@ -5,7 +5,8 @@ import codeql.swift.elements.expr.ImplicitConversionExpr
module Generated {
class ExistentialMetatypeToObjectExpr extends Synth::TExistentialMetatypeToObjectExpr,
ImplicitConversionExpr {
ImplicitConversionExpr
{
override string getAPrimaryQlClass() { result = "ExistentialMetatypeToObjectExpr" }
}
}

View File

@@ -5,7 +5,8 @@ import codeql.swift.elements.expr.ImplicitConversionExpr
module Generated {
class ForeignObjectConversionExpr extends Synth::TForeignObjectConversionExpr,
ImplicitConversionExpr {
ImplicitConversionExpr
{
override string getAPrimaryQlClass() { result = "ForeignObjectConversionExpr" }
}
}

View File

@@ -5,7 +5,8 @@ import codeql.swift.elements.expr.ImplicitConversionExpr
module Generated {
class LinearFunctionExtractOriginalExpr extends Synth::TLinearFunctionExtractOriginalExpr,
ImplicitConversionExpr {
ImplicitConversionExpr
{
override string getAPrimaryQlClass() { result = "LinearFunctionExtractOriginalExpr" }
}
}

View File

@@ -5,7 +5,8 @@ import codeql.swift.elements.expr.ImplicitConversionExpr
module Generated {
class LinearToDifferentiableFunctionExpr extends Synth::TLinearToDifferentiableFunctionExpr,
ImplicitConversionExpr {
ImplicitConversionExpr
{
override string getAPrimaryQlClass() { result = "LinearToDifferentiableFunctionExpr" }
}
}

View File

@@ -10,7 +10,8 @@ module Generated {
* wrapper with an initializer.
*/
class PropertyWrapperValuePlaceholderExpr extends Synth::TPropertyWrapperValuePlaceholderExpr,
Expr {
Expr
{
override string getAPrimaryQlClass() { result = "PropertyWrapperValuePlaceholderExpr" }
/**

View File

@@ -5,7 +5,8 @@ import codeql.swift.elements.expr.ImplicitConversionExpr
module Generated {
class ProtocolMetatypeToObjectExpr extends Synth::TProtocolMetatypeToObjectExpr,
ImplicitConversionExpr {
ImplicitConversionExpr
{
override string getAPrimaryQlClass() { result = "ProtocolMetatypeToObjectExpr" }
}
}

View File

@@ -6,7 +6,8 @@ import codeql.swift.elements.expr.IdentityExpr
module Generated {
class UnresolvedMemberChainResultExpr extends Synth::TUnresolvedMemberChainResultExpr,
IdentityExpr, ErrorElement {
IdentityExpr, ErrorElement
{
override string getAPrimaryQlClass() { result = "UnresolvedMemberChainResultExpr" }
}
}

View File

@@ -6,7 +6,8 @@ import codeql.swift.elements.expr.ImplicitConversionExpr
module Generated {
class UnresolvedTypeConversionExpr extends Synth::TUnresolvedTypeConversionExpr,
ImplicitConversionExpr, ErrorElement {
ImplicitConversionExpr, ErrorElement
{
override string getAPrimaryQlClass() { result = "UnresolvedTypeConversionExpr" }
}
}

View File

@@ -5,7 +5,8 @@ import codeql.swift.elements.type.BuiltinType
module Generated {
class BuiltinRawUnsafeContinuationType extends Synth::TBuiltinRawUnsafeContinuationType,
BuiltinType {
BuiltinType
{
override string getAPrimaryQlClass() { result = "BuiltinRawUnsafeContinuationType" }
}
}

View File

@@ -5,5 +5,6 @@ import codeql.swift.elements.type.AnyGenericType
module Generated {
class NominalOrBoundGenericNominalType extends Synth::TNominalOrBoundGenericNominalType,
AnyGenericType { }
AnyGenericType
{ }
}

View File

@@ -124,7 +124,8 @@ private class CleartextStorageDatabaseEncryptionSanitizer extends CleartextStora
* An additional taint step for cleartext database storage vulnerabilities.
* Needed until we have proper content flow through arrays.
*/
private class CleartextStorageDatabaseArrayAdditionalTaintStep extends CleartextStorageDatabaseAdditionalTaintStep {
private class CleartextStorageDatabaseArrayAdditionalTaintStep extends CleartextStorageDatabaseAdditionalTaintStep
{
override predicate step(DataFlow::Node nodeFrom, DataFlow::Node nodeTo) {
exists(ArrayExpr arr |
nodeFrom.asExpr() = arr.getAnElement() and

View File

@@ -74,7 +74,8 @@ private class NSUserDefaultsControllerStore extends CleartextStoragePreferencesS
/**
* An encryption sanitizer for cleartext preferences storage vulnerabilities.
*/
private class CleartextStoragePreferencesEncryptionSanitizer extends CleartextStoragePreferencesSanitizer {
private class CleartextStoragePreferencesEncryptionSanitizer extends CleartextStoragePreferencesSanitizer
{
CleartextStoragePreferencesEncryptionSanitizer() { this.asExpr() instanceof EncryptedExpr }
}