prehistoric-systems/DNSecure
1
0
Fork 0
mirror of https://github.com/kkebo/DNSecure.git synced 2026-03-11 08:54:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Compare commits

base: prehistoric-systems:main
Branches Tags
prehistoric-systems:main
prehistoric-systems:macos
prehistoric-systems:1.6.2
prehistoric-systems:1.6.1
prehistoric-systems:1.6.0
prehistoric-systems:1.6.0-beta.2
prehistoric-systems:1.6.0-beta.1
prehistoric-systems:1.5.1
prehistoric-systems:1.5.0
prehistoric-systems:1.4.5
prehistoric-systems:1.4.4
prehistoric-systems:1.4.3
prehistoric-systems:1.4.2
prehistoric-systems:1.4.1
prehistoric-systems:1.4.0
prehistoric-systems:1.3.0
prehistoric-systems:1.2.0
prehistoric-systems:1.1.1
prehistoric-systems:1.1.0
prehistoric-systems:1.0.3
..
compare: prehistoric-systems:1.4.2
Branches Tags
prehistoric-systems:main
prehistoric-systems:macos
prehistoric-systems:1.6.2
prehistoric-systems:1.6.1
prehistoric-systems:1.6.0
prehistoric-systems:1.6.0-beta.2
prehistoric-systems:1.6.0-beta.1
prehistoric-systems:1.5.1
prehistoric-systems:1.5.0
prehistoric-systems:1.4.5
prehistoric-systems:1.4.4
prehistoric-systems:1.4.3
prehistoric-systems:1.4.2
prehistoric-systems:1.4.1
prehistoric-systems:1.4.0
prehistoric-systems:1.3.0
prehistoric-systems:1.2.0
prehistoric-systems:1.1.1
prehistoric-systems:1.1.0
prehistoric-systems:1.0.3

No commits in common. "main" and "1.4.2" have entirely different histories.
main ... 1.4.2

90 changed files with 1136 additions and 1779 deletions
Show stats Expand all files Collapse all files

4
.gitattributes vendored
View file

@ -1,4 +0,0 @@
* text=auto eol=lf
*.pbxproj merge=union
Package.resolved text linguist-language=json linguist-generated=false
.swift-format text linguist-language=json

1
.github/CODEOWNERS vendored
View file

@ -1 +0,0 @@
* @kkebo

10
.github/dependabot.yml vendored
View file

@ -1,10 +0,0 @@
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
assignees:
- "kkebo"
commit-message:
prefix: "ci"

27
.github/workflows/ci.yml vendored
View file

@ -1,27 +0,0 @@
name: ci
on:
push:
branches: ["main"]
pull_request:
branches: ["main"]
permissions: {}
defaults:
run:
shell: bash -euo pipefail {0}
jobs:
lint:
runs-on: ubuntu-24.04-arm
container: swift:6.2
permissions:
contents: read
steps:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- run: swift format lint -rsp .
yamllint:
runs-on: ubuntu-24.04-arm
permissions:
contents: read
steps:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- run: yamllint --version
- run: yamllint --strict --config-file .yamllint.yml .

89
.github/workflows/codeql.yml vendored
View file

@ -1,89 +0,0 @@
# For most projects, this workflow file will not need changing; you simply need
# to commit it to your repository.
#
# You may wish to alter this file to override the set of languages analyzed,
# or to provide custom queries or build logic.
#
# ******** NOTE ********
# We have attempted to detect the languages in your repository. Please check
# the `language` matrix defined below to confirm you have the correct set of
# supported CodeQL languages.
#
name: "CodeQL Advanced"
on:
push:
branches: ["main"]
pull_request:
branches: ["main"]
schedule:
- cron: '40 19 * * 3'
jobs:
analyze:
name: Analyze (${{ matrix.language }})
# Runner size impacts CodeQL analysis time. To learn more, please see:
# - https://gh.io/recommended-hardware-resources-for-running-codeql
# - https://gh.io/supported-runners-and-hardware-resources
# - https://gh.io/using-larger-runners (GitHub.com only)
# Consider using larger runners or machines with greater resources for possible analysis time improvements.
runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
permissions:
# required for all workflows
security-events: write
# required to fetch internal or private CodeQL packs
packages: read
# only required for workflows in private repositories
actions: read
contents: read
strategy:
fail-fast: false
matrix:
include:
- language: actions
build-mode: none
- language: swift
build-mode: manual
# CodeQL supports the following values keywords for 'language': 'actions', 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'rust', 'swift'
# Use `c-cpp` to analyze code written in C, C++ or both
# Use 'java-kotlin' to analyze code written in Java, Kotlin or both
# Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
# To learn more about changing the languages that are analyzed or customizing the build mode for your analysis,
# see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning.
# If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how
# your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
steps:
- name: Checkout repository
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
# Add any setup steps before running the `github/codeql-action/init` action.
# This includes steps like installing compilers or runtimes (`actions/setup-node`
# or others). This is typically only required for manual builds.
# - name: Setup runtime (example)
# uses: actions/setup-example@v1
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@0d579ffd059c29b07949a3cce3983f0780820c98 # v4.32.6
with:
languages: ${{ matrix.language }}
build-mode: ${{ matrix.build-mode }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# If the analyze step fails for one of the languages you are analyzing with
# "We were unable to automatically build your code", modify the matrix above
# to set the build mode to "manual" for that language. Then modify this step
# to build your code.
# ℹ️ Command-line programs to run using the OS shell.
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
- name: Run manual build steps
# For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
# queries: security-extended,security-and-quality
if: matrix.build-mode == 'manual'
shell: bash
env:
DEVELOPER_DIR: /Applications/Xcode_26.1.1.app
run: xcodebuild build -project DNSecure.xcodeproj -scheme DNSecure -destination "platform=iOS Simulator,name=iPad Pro 13-inch (M5),OS=26.1" -quiet -showBuildTimingSummary
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@0d579ffd059c29b07949a3cce3983f0780820c98 # v4.32.6
with:
category: "/language:${{matrix.language}}"

2
.gitignore vendored
View file

@ -47,7 +47,7 @@ playground.xcworkspace
# *.xcodeproj
# Xcode automatically generates this directory with a .xcworkspacedata file and xcuserdata
# hence it is not needed unless you have added a package configuration file to your project
.swiftpm
# .swiftpm
.build/

75
.swift-format
View file

@ -1,75 +0,0 @@
{
"fileScopedDeclarationPrivacy" : {
"accessLevel" : "private"
},
"indentConditionalCompilationBlocks" : true,
"indentSwitchCaseLabels" : false,
"indentation" : {
"spaces" : 4
},
"lineBreakAroundMultilineExpressionChainComponents" : true,
"lineBreakBeforeControlFlowKeywords" : false,
"lineBreakBeforeEachArgument" : true,
"lineBreakBeforeEachGenericRequirement" : true,
"lineBreakBetweenDeclarationAttributes" : false,
"lineLength" : 120,
"maximumBlankLines" : 1,
"multiElementCollectionTrailingCommas" : true,
"noAssignmentInExpressions" : {
"allowedFunctions" : [
"XCTAssertNoThrow"
]
},
"prioritizeKeepingFunctionOutputTogether" : true,
"reflowMultilineStringLiterals" : "never",
"respectsExistingLineBreaks" : true,
"rules" : {
"AllPublicDeclarationsHaveDocumentation" : false,
"AlwaysUseLiteralForEmptyCollectionInit" : true,
"AlwaysUseLowerCamelCase" : true,
"AmbiguousTrailingClosureOverload" : true,
"AvoidRetroactiveConformances" : false,
"BeginDocumentationCommentWithOneLineSummary" : true,
"DoNotUseSemicolons" : true,
"DontRepeatTypeInStaticProperties" : true,
"FileScopedDeclarationPrivacy" : true,
"FullyIndirectEnum" : true,
"GroupNumericLiterals" : true,
"IdentifiersMustBeASCII" : true,
"NeverForceUnwrap" : false,
"NeverUseForceTry" : true,
"NeverUseImplicitlyUnwrappedOptionals" : true,
"NoAccessLevelOnExtensionDeclaration" : true,
"NoAssignmentInExpressions" : true,
"NoBlockComments" : true,
"NoCasesWithOnlyFallthrough" : true,
"NoEmptyLinesOpeningClosingBraces" : true,
"NoEmptyTrailingClosureParentheses" : true,
"NoLabelsInCasePatterns" : true,
"NoLeadingUnderscores" : true,
"NoParensAroundConditions" : true,
"NoPlaygroundLiterals" : true,
"NoVoidReturnOnFunctionSignature" : true,
"OmitExplicitReturns" : true,
"OneCasePerLine" : true,
"OneVariableDeclarationPerLine" : true,
"OnlyOneTrailingClosureArgument" : true,
"OrderedImports" : true,
"ReplaceForEachWithForLoop" : true,
"ReturnVoidInsteadOfEmptyTuple" : true,
"TypeNamesShouldBeCapitalized" : true,
"UseEarlyExits" : true,
"UseExplicitNilCheckInConditions" : true,
"UseLetInEveryBoundCaseVariable" : true,
"UseShorthandTypeNames" : true,
"UseSingleLinePropertyGetter" : true,
"UseSynthesizedInitializer" : true,
"UseTripleSlashForDocumentationComments" : true,
"UseWhereClausesInForLoops" : true,
"ValidateDocumentationComments" : true
},
"spacesAroundRangeFormationOperators" : false,
"spacesBeforeEndOfLineComments" : 2,
"tabWidth" : 4,
"version" : 1
}

7
.yamllint.yml
View file

@ -1,7 +0,0 @@
extends: default
rules:
line-length: false
document-start: false
truthy:
check-keys: false

318
DNSecure.xcodeproj/project.pbxproj
View file

@ -3,11 +3,32 @@
archiveVersion = 1;
classes = {
};
objectVersion = 77;
objectVersion = 50;
objects = {
/* Begin PBXBuildFile section */
890B80D5251DC3A20046BAA0 /* DetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 890B80D4251DC3A20046BAA0 /* DetailView.swift */; };
890B80DF251DC6B50046BAA0 /* Presets.swift in Sources */ = {isa = PBXBuildFile; fileRef = 890B80DE251DC6B50046BAA0 /* Presets.swift */; };
893AA853258F99630060B022 /* NEOnDemandRuleInterfaceType+CaseIterable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 893AA852258F99630060B022 /* NEOnDemandRuleInterfaceType+CaseIterable.swift */; };
893AA858258F996F0060B022 /* NEOnDemandRuleInterfaceType+CustomStringConvertible.swift in Sources */ = {isa = PBXBuildFile; fileRef = 893AA857258F996F0060B022 /* NEOnDemandRuleInterfaceType+CustomStringConvertible.swift */; };
893AA85D258F997A0060B022 /* NEOnDemandRuleInterfaceType+Codable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 893AA85C258F997A0060B022 /* NEOnDemandRuleInterfaceType+Codable.swift */; };
893AA862258F998C0060B022 /* NEOnDemandRuleInterfaceType+ssidIsUsed.swift in Sources */ = {isa = PBXBuildFile; fileRef = 893AA861258F998C0060B022 /* NEOnDemandRuleInterfaceType+ssidIsUsed.swift */; };
893AA867258F99990060B022 /* NEOnDemandRuleAction+CaseIterable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 893AA866258F99990060B022 /* NEOnDemandRuleAction+CaseIterable.swift */; };
893AA86C258F99A10060B022 /* NEOnDemandRuleAction+CustomStringConvertible.swift in Sources */ = {isa = PBXBuildFile; fileRef = 893AA86B258F99A10060B022 /* NEOnDemandRuleAction+CustomStringConvertible.swift */; };
893AA871258F99AD0060B022 /* NEOnDemandRuleAction+Codable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 893AA870258F99AD0060B022 /* NEOnDemandRuleAction+Codable.swift */; };
8940023C24ACBD2700EBE74B /* DNSecureApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8940023B24ACBD2700EBE74B /* DNSecureApp.swift */; };
8940023E24ACBD2700EBE74B /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8940023D24ACBD2700EBE74B /* ContentView.swift */; };
8940024024ACBD2800EBE74B /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 8940023F24ACBD2800EBE74B /* Assets.xcassets */; };
8940024324ACBD2800EBE74B /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 8940024224ACBD2800EBE74B /* Preview Assets.xcassets */; };
8940024E24ACBD2800EBE74B /* DNSecureTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8940024D24ACBD2800EBE74B /* DNSecureTests.swift */; };
8940025924ACBD2800EBE74B /* DNSecureUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8940025824ACBD2800EBE74B /* DNSecureUITests.swift */; };
8940026924ACBE4900EBE74B /* NetworkExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8940026824ACBE4900EBE74B /* NetworkExtension.framework */; };
894958AD2548405E009691D5 /* RuleView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 894958AC2548405E009691D5 /* RuleView.swift */; };
8963FDFB251DF1BC00E3DFE7 /* Bundle+displayName.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8963FDFA251DF1BC00E3DFE7 /* Bundle+displayName.swift */; };
8986CDCF251D9B3400D947CD /* Resolver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8986CDCE251D9B3400D947CD /* Resolver.swift */; };
8998041628DCDED800C8B421 /* DoTSections.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8998041528DCDED800C8B421 /* DoTSections.swift */; };
8998041828DCDEEF00C8B421 /* DoHSections.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8998041728DCDEEF00C8B421 /* DoHSections.swift */; };
89CB922125209DD100B6983C /* HowToActivateView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89CB922025209DD100B6983C /* HowToActivateView.swift */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@ -28,44 +49,38 @@
/* End PBXContainerItemProxy section */
/* Begin PBXFileReference section */
890B80D4251DC3A20046BAA0 /* DetailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DetailView.swift; sourceTree = "<group>"; };
890B80DE251DC6B50046BAA0 /* Presets.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Presets.swift; sourceTree = "<group>"; };
8924EDF324C9CDF1004AF871 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
893AA852258F99630060B022 /* NEOnDemandRuleInterfaceType+CaseIterable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NEOnDemandRuleInterfaceType+CaseIterable.swift"; sourceTree = "<group>"; };
893AA857258F996F0060B022 /* NEOnDemandRuleInterfaceType+CustomStringConvertible.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NEOnDemandRuleInterfaceType+CustomStringConvertible.swift"; sourceTree = "<group>"; };
893AA85C258F997A0060B022 /* NEOnDemandRuleInterfaceType+Codable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NEOnDemandRuleInterfaceType+Codable.swift"; sourceTree = "<group>"; };
893AA861258F998C0060B022 /* NEOnDemandRuleInterfaceType+ssidIsUsed.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NEOnDemandRuleInterfaceType+ssidIsUsed.swift"; sourceTree = "<group>"; };
893AA866258F99990060B022 /* NEOnDemandRuleAction+CaseIterable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NEOnDemandRuleAction+CaseIterable.swift"; sourceTree = "<group>"; };
893AA86B258F99A10060B022 /* NEOnDemandRuleAction+CustomStringConvertible.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NEOnDemandRuleAction+CustomStringConvertible.swift"; sourceTree = "<group>"; };
893AA870258F99AD0060B022 /* NEOnDemandRuleAction+Codable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NEOnDemandRuleAction+Codable.swift"; sourceTree = "<group>"; };
8940023824ACBD2700EBE74B /* DNSecure.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = DNSecure.app; sourceTree = BUILT_PRODUCTS_DIR; };
8940023B24ACBD2700EBE74B /* DNSecureApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DNSecureApp.swift; sourceTree = "<group>"; };
8940023D24ACBD2700EBE74B /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
8940023F24ACBD2800EBE74B /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
8940024224ACBD2800EBE74B /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
8940024424ACBD2800EBE74B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
8940024924ACBD2800EBE74B /* DNSecureTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = DNSecureTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
8940024D24ACBD2800EBE74B /* DNSecureTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DNSecureTests.swift; sourceTree = "<group>"; };
8940024F24ACBD2800EBE74B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
8940025424ACBD2800EBE74B /* DNSecureUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = DNSecureUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
8940025824ACBD2800EBE74B /* DNSecureUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DNSecureUITests.swift; sourceTree = "<group>"; };
8940025A24ACBD2800EBE74B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
8940026624ACBE4900EBE74B /* DNSecure.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DNSecure.entitlements; sourceTree = "<group>"; };
8940026824ACBE4900EBE74B /* NetworkExtension.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = NetworkExtension.framework; path = System/Library/Frameworks/NetworkExtension.framework; sourceTree = SDKROOT; };
894958AC2548405E009691D5 /* RuleView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RuleView.swift; sourceTree = "<group>"; };
8963FDFA251DF1BC00E3DFE7 /* Bundle+displayName.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Bundle+displayName.swift"; sourceTree = "<group>"; };
8986CDCE251D9B3400D947CD /* Resolver.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Resolver.swift; sourceTree = "<group>"; };
8998041528DCDED800C8B421 /* DoTSections.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DoTSections.swift; sourceTree = "<group>"; };
8998041728DCDEEF00C8B421 /* DoHSections.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DoHSections.swift; sourceTree = "<group>"; };
89CB922025209DD100B6983C /* HowToActivateView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HowToActivateView.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */
899AD03F2E66100500449710 /* Exceptions for "DNSecure" folder in "DNSecure" target */ = {
isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
membershipExceptions = (
Info.plist,
);
target = 8940023724ACBD2700EBE74B /* DNSecure */;
};
/* End PBXFileSystemSynchronizedBuildFileExceptionSet section */
/* Begin PBXFileSystemSynchronizedRootGroup section */
899AD0232E66100500449710 /* DNSecure */ = {
isa = PBXFileSystemSynchronizedRootGroup;
exceptions = (
899AD03F2E66100500449710 /* Exceptions for "DNSecure" folder in "DNSecure" target */,
);
path = DNSecure;
sourceTree = "<group>";
};
899AD0422E66100E00449710 /* DNSecureTests */ = {
isa = PBXFileSystemSynchronizedRootGroup;
path = DNSecureTests;
sourceTree = "<group>";
};
899AD0472E66101100449710 /* DNSecureUITests */ = {
isa = PBXFileSystemSynchronizedRootGroup;
path = DNSecureUITests;
sourceTree = "<group>";
};
/* End PBXFileSystemSynchronizedRootGroup section */
/* Begin PBXFrameworksBuildPhase section */
8940023524ACBD2700EBE74B /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
@ -92,13 +107,50 @@
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
893AA816258F790D0060B022 /* Views */ = {
isa = PBXGroup;
children = (
8940023D24ACBD2700EBE74B /* ContentView.swift */,
89CB922025209DD100B6983C /* HowToActivateView.swift */,
890B80D4251DC3A20046BAA0 /* DetailView.swift */,
894958AC2548405E009691D5 /* RuleView.swift */,
8998041528DCDED800C8B421 /* DoTSections.swift */,
8998041728DCDEEF00C8B421 /* DoHSections.swift */,
);
path = Views;
sourceTree = "<group>";
};
893AA817258F79F70060B022 /* Models */ = {
isa = PBXGroup;
children = (
8986CDCE251D9B3400D947CD /* Resolver.swift */,
890B80DE251DC6B50046BAA0 /* Presets.swift */,
);
path = Models;
sourceTree = "<group>";
};
893AA818258F7A0C0060B022 /* Extensions */ = {
isa = PBXGroup;
children = (
8963FDFA251DF1BC00E3DFE7 /* Bundle+displayName.swift */,
893AA852258F99630060B022 /* NEOnDemandRuleInterfaceType+CaseIterable.swift */,
893AA857258F996F0060B022 /* NEOnDemandRuleInterfaceType+CustomStringConvertible.swift */,
893AA85C258F997A0060B022 /* NEOnDemandRuleInterfaceType+Codable.swift */,
893AA861258F998C0060B022 /* NEOnDemandRuleInterfaceType+ssidIsUsed.swift */,
893AA866258F99990060B022 /* NEOnDemandRuleAction+CaseIterable.swift */,
893AA86B258F99A10060B022 /* NEOnDemandRuleAction+CustomStringConvertible.swift */,
893AA870258F99AD0060B022 /* NEOnDemandRuleAction+Codable.swift */,
);
path = Extensions;
sourceTree = "<group>";
};
8940022F24ACBD2700EBE74B = {
isa = PBXGroup;
children = (
8924EDF324C9CDF1004AF871 /* README.md */,
899AD0232E66100500449710 /* DNSecure */,
899AD0422E66100E00449710 /* DNSecureTests */,
899AD0472E66101100449710 /* DNSecureUITests */,
8940023A24ACBD2700EBE74B /* DNSecure */,
8940024C24ACBD2800EBE74B /* DNSecureTests */,
8940025724ACBD2800EBE74B /* DNSecureUITests */,
8940023924ACBD2700EBE74B /* Products */,
8940026724ACBE4900EBE74B /* Frameworks */,
);
@ -114,6 +166,47 @@
name = Products;
sourceTree = "<group>";
};
8940023A24ACBD2700EBE74B /* DNSecure */ = {
isa = PBXGroup;
children = (
8940026624ACBE4900EBE74B /* DNSecure.entitlements */,
8940023B24ACBD2700EBE74B /* DNSecureApp.swift */,
893AA816258F790D0060B022 /* Views */,
893AA817258F79F70060B022 /* Models */,
893AA818258F7A0C0060B022 /* Extensions */,
8940023F24ACBD2800EBE74B /* Assets.xcassets */,
8940024424ACBD2800EBE74B /* Info.plist */,
8940024124ACBD2800EBE74B /* Preview Content */,
);
path = DNSecure;
sourceTree = "<group>";
};
8940024124ACBD2800EBE74B /* Preview Content */ = {
isa = PBXGroup;
children = (
8940024224ACBD2800EBE74B /* Preview Assets.xcassets */,
);
path = "Preview Content";
sourceTree = "<group>";
};
8940024C24ACBD2800EBE74B /* DNSecureTests */ = {
isa = PBXGroup;
children = (
8940024D24ACBD2800EBE74B /* DNSecureTests.swift */,
8940024F24ACBD2800EBE74B /* Info.plist */,
);
path = DNSecureTests;
sourceTree = "<group>";
};
8940025724ACBD2800EBE74B /* DNSecureUITests */ = {
isa = PBXGroup;
children = (
8940025824ACBD2800EBE74B /* DNSecureUITests.swift */,
8940025A24ACBD2800EBE74B /* Info.plist */,
);
path = DNSecureUITests;
sourceTree = "<group>";
};
8940026724ACBE4900EBE74B /* Frameworks */ = {
isa = PBXGroup;
children = (
@ -137,9 +230,6 @@
);
dependencies = (
);
fileSystemSynchronizedGroups = (
899AD0232E66100500449710 /* DNSecure */,
);
name = DNSecure;
productName = DNSecure;
productReference = 8940023824ACBD2700EBE74B /* DNSecure.app */;
@ -158,9 +248,6 @@
dependencies = (
8940024B24ACBD2800EBE74B /* PBXTargetDependency */,
);
fileSystemSynchronizedGroups = (
899AD0422E66100E00449710 /* DNSecureTests */,
);
name = DNSecureTests;
productName = DNSecureTests;
productReference = 8940024924ACBD2800EBE74B /* DNSecureTests.xctest */;
@ -179,9 +266,6 @@
dependencies = (
8940025624ACBD2800EBE74B /* PBXTargetDependency */,
);
fileSystemSynchronizedGroups = (
899AD0472E66101100449710 /* DNSecureUITests */,
);
name = DNSecureUITests;
productName = DNSecureUITests;
productReference = 8940025424ACBD2800EBE74B /* DNSecureUITests.xctest */;
@ -193,9 +277,8 @@
8940023024ACBD2700EBE74B /* Project object */ = {
isa = PBXProject;
attributes = {
BuildIndependentTargetsInParallel = YES;
LastSwiftUpdateCheck = 1200;
LastUpgradeCheck = 2600;
LastUpgradeCheck = 1200;
TargetAttributes = {
8940023724ACBD2700EBE74B = {
CreatedOnToolsVersion = 12.0;
@ -211,6 +294,7 @@
};
};
buildConfigurationList = 8940023324ACBD2700EBE74B /* Build configuration list for PBXProject "DNSecure" */;
compatibilityVersion = "Xcode 9.3";
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
@ -218,8 +302,6 @@
Base,
);
mainGroup = 8940022F24ACBD2700EBE74B;
minimizedProjectReferenceProxies = 1;
preferredProjectObjectVersion = 77;
productRefGroup = 8940023924ACBD2700EBE74B /* Products */;
projectDirPath = "";
projectRoot = "";
@ -236,6 +318,8 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
8940024324ACBD2800EBE74B /* Preview Assets.xcassets in Resources */,
8940024024ACBD2800EBE74B /* Assets.xcassets in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -260,6 +344,23 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
8986CDCF251D9B3400D947CD /* Resolver.swift in Sources */,
89CB922125209DD100B6983C /* HowToActivateView.swift in Sources */,
890B80D5251DC3A20046BAA0 /* DetailView.swift in Sources */,
893AA853258F99630060B022 /* NEOnDemandRuleInterfaceType+CaseIterable.swift in Sources */,
893AA871258F99AD0060B022 /* NEOnDemandRuleAction+Codable.swift in Sources */,
893AA85D258F997A0060B022 /* NEOnDemandRuleInterfaceType+Codable.swift in Sources */,
8940023E24ACBD2700EBE74B /* ContentView.swift in Sources */,
894958AD2548405E009691D5 /* RuleView.swift in Sources */,
8998041828DCDEEF00C8B421 /* DoHSections.swift in Sources */,
890B80DF251DC6B50046BAA0 /* Presets.swift in Sources */,
893AA858258F996F0060B022 /* NEOnDemandRuleInterfaceType+CustomStringConvertible.swift in Sources */,
8940023C24ACBD2700EBE74B /* DNSecureApp.swift in Sources */,
8998041628DCDED800C8B421 /* DoTSections.swift in Sources */,
893AA862258F998C0060B022 /* NEOnDemandRuleInterfaceType+ssidIsUsed.swift in Sources */,
893AA867258F99990060B022 /* NEOnDemandRuleAction+CaseIterable.swift in Sources */,
893AA86C258F99A10060B022 /* NEOnDemandRuleAction+CustomStringConvertible.swift in Sources */,
8963FDFB251DF1BC00E3DFE7 /* Bundle+displayName.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -267,6 +368,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
8940024E24ACBD2800EBE74B /* DNSecureTests.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -274,6 +376,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
8940025924ACBD2800EBE74B /* DNSecureUITests.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -297,10 +400,10 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_ENABLE_OBJC_WEAK = YES;
@ -328,11 +431,9 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = X4678G5DL2;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
GCC_C_LANGUAGE_STANDARD = gnu17;
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_DYNAMIC_NO_PIC = NO;
GCC_NO_COMMON_BLOCKS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
@ -347,14 +448,12 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)";
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 6.0;
};
name = Debug;
};
@ -362,10 +461,10 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_ENABLE_OBJC_WEAK = YES;
@ -393,11 +492,9 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = X4678G5DL2;
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
GCC_C_LANGUAGE_STANDARD = gnu17;
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
@ -406,12 +503,11 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
SDKROOT = iphoneos;
SWIFT_COMPILATION_MODE = wholemodule;
SWIFT_VERSION = 6.0;
SWIFT_OPTIMIZATION_LEVEL = "-O";
VALIDATE_PRODUCT = YES;
};
name = Release;
@ -421,35 +517,24 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
CODE_SIGN_ENTITLEMENTS = DNSecure/DNSecure.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
CURRENT_PROJECT_VERSION = 16;
DEVELOPMENT_ASSET_PATHS = "\"DNSecure/Preview Content\"";
DEVELOPMENT_TEAM = X4678G5DL2;
ENABLE_APP_SANDBOX = YES;
ENABLE_OUTGOING_NETWORK_CONNECTIONS = YES;
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = DNSecure/Info.plist;
INFOPLIST_KEY_ITSAppUsesNonExemptEncryption = NO;
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
INFOPLIST_KEY_UILaunchScreen_Generation = YES;
INFOPLIST_KEY_UIRequiredDeviceCapabilities = armv7;
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.6.2;
MARKETING_VERSION = 1.4.2;
PRODUCT_BUNDLE_IDENTIFIER = xyz.kebo.DNSecure;
PRODUCT_NAME = "$(TARGET_NAME)";
STRING_CATALOG_GENERATE_SYMBOLS = YES;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = YES;
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
SWIFT_APPROACHABLE_CONCURRENCY = YES;
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
@ -459,35 +544,24 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
CODE_SIGN_ENTITLEMENTS = DNSecure/DNSecure.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
CURRENT_PROJECT_VERSION = 16;
DEVELOPMENT_ASSET_PATHS = "\"DNSecure/Preview Content\"";
DEVELOPMENT_TEAM = X4678G5DL2;
ENABLE_APP_SANDBOX = YES;
ENABLE_OUTGOING_NETWORK_CONNECTIONS = YES;
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = DNSecure/Info.plist;
INFOPLIST_KEY_ITSAppUsesNonExemptEncryption = NO;
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
INFOPLIST_KEY_UILaunchScreen_Generation = YES;
INFOPLIST_KEY_UIRequiredDeviceCapabilities = armv7;
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.6.2;
MARKETING_VERSION = 1.4.2;
PRODUCT_BUNDLE_IDENTIFIER = xyz.kebo.DNSecure;
PRODUCT_NAME = "$(TARGET_NAME)";
STRING_CATALOG_GENERATE_SYMBOLS = YES;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = YES;
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
SWIFT_APPROACHABLE_CONCURRENCY = YES;
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Release;
@ -495,48 +569,62 @@
8940026124ACBD2800EBE74B /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = X4678G5DL2;
GENERATE_INFOPLIST_FILE = YES;
MARKETING_VERSION = 1.0;
INFOPLIST_FILE = DNSecureTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = xyz.kebo.DNSecureTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_APPROACHABLE_CONCURRENCY = YES;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/DNSecure.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/DNSecure";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/DNSecure.app/DNSecure";
};
name = Debug;
};
8940026224ACBD2800EBE74B /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = X4678G5DL2;
GENERATE_INFOPLIST_FILE = YES;
MARKETING_VERSION = 1.0;
INFOPLIST_FILE = DNSecureTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = xyz.kebo.DNSecureTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_APPROACHABLE_CONCURRENCY = YES;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/DNSecure.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/DNSecure";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/DNSecure.app/DNSecure";
};
name = Release;
};
8940026424ACBD2800EBE74B /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = X4678G5DL2;
GENERATE_INFOPLIST_FILE = YES;
MARKETING_VERSION = 1.0;
INFOPLIST_FILE = DNSecureUITests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = xyz.kebo.DNSecureUITests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_APPROACHABLE_CONCURRENCY = YES;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
TEST_TARGET_NAME = DNSecure;
};
@ -545,14 +633,18 @@
8940026524ACBD2800EBE74B /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = X4678G5DL2;
GENERATE_INFOPLIST_FILE = YES;
MARKETING_VERSION = 1.0;
INFOPLIST_FILE = DNSecureUITests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = xyz.kebo.DNSecureUITests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_APPROACHABLE_CONCURRENCY = YES;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
TEST_TARGET_NAME = DNSecure;
};

2
DNSecure.xcodeproj/xcshareddata/xcschemes/DNSecure.xcscheme
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "2600"
LastUpgradeVersion = "1200"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"

8
DNSecure/AppIcon.icon/Assets/DNSecure-icon.svg
View file

File diff suppressed because one or more lines are too long
Side by side

Before

Width:  |  Height:  |  Size: 32 KiB

29
DNSecure/AppIcon.icon/icon.json
View file

@ -1,29 +0,0 @@
{
"fill" : {
"automatic-gradient" : "srgb:0.96863,0.77255,0.28235,1.00000"
},
"groups" : [
{
"layers" : [
{
"image-name" : "DNSecure-icon.svg",
"name" : "DNSecure-icon"
}
],
"shadow" : {
"kind" : "neutral",
"opacity" : 0.5
},
"translucency" : {
"enabled" : true,
"value" : 0.5
}
}
],
"supported-platforms" : {
"circles" : [
"watchOS"
],
"squares" : "shared"
}
}

14
DNSecure/Assets.xcassets/AppIcon-legacy.appiconset/Contents.json
View file

@ -1,14 +0,0 @@
{
"images" : [
{
"filename" : "Icon-1024.png",
"idiom" : "universal",
"platform" : "ios",
"size" : "1024x1024"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

116
DNSecure/Assets.xcassets/AppIcon.appiconset/Contents.json Normal file
View file

@ -0,0 +1,116 @@
{
"images" : [
{
"filename" : "Icon-40.png",
"idiom" : "iphone",
"scale" : "2x",
"size" : "20x20"
},
{
"filename" : "Icon-60.png",
"idiom" : "iphone",
"scale" : "3x",
"size" : "20x20"
},
{
"filename" : "Icon-58.png",
"idiom" : "iphone",
"scale" : "2x",
"size" : "29x29"
},
{
"filename" : "Icon-87.png",
"idiom" : "iphone",
"scale" : "3x",
"size" : "29x29"
},
{
"filename" : "Icon-80.png",
"idiom" : "iphone",
"scale" : "2x",
"size" : "40x40"
},
{
"filename" : "Icon-120.png",
"idiom" : "iphone",
"scale" : "3x",
"size" : "40x40"
},
{
"filename" : "Icon-121.png",
"idiom" : "iphone",
"scale" : "2x",
"size" : "60x60"
},
{
"filename" : "Icon-180.png",
"idiom" : "iphone",
"scale" : "3x",
"size" : "60x60"
},
{
"filename" : "Icon-20.png",
"idiom" : "ipad",
"scale" : "1x",
"size" : "20x20"
},
{
"filename" : "Icon-41.png",
"idiom" : "ipad",
"scale" : "2x",
"size" : "20x20"
},
{
"filename" : "Icon-29.png",
"idiom" : "ipad",
"scale" : "1x",
"size" : "29x29"
},
{
"filename" : "Icon-59.png",
"idiom" : "ipad",
"scale" : "2x",
"size" : "29x29"
},
{
"filename" : "Icon-42.png",
"idiom" : "ipad",
"scale" : "1x",
"size" : "40x40"
},
{
"filename" : "Icon-81.png",
"idiom" : "ipad",
"scale" : "2x",
"size" : "40x40"
},
{
"filename" : "Icon-76.png",
"idiom" : "ipad",
"scale" : "1x",
"size" : "76x76"
},
{
"filename" : "Icon-152.png",
"idiom" : "ipad",
"scale" : "2x",
"size" : "76x76"
},
{
"filename" : "Icon-167.png",
"idiom" : "ipad",
"scale" : "2x",
"size" : "83.5x83.5"
},
{
"filename" : "Icon-1024.png",
"idiom" : "ios-marketing",
"scale" : "1x",
"size" : "1024x1024"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

0
DNSecure/Assets.xcassets/AppIcon-legacy.appiconset/Icon-1024.png → DNSecure/Assets.xcassets/AppIcon.appiconset/Icon-1024.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 32 KiB

After

Width:  |  Height:  |  Size: 32 KiB

BIN
DNSecure/Assets.xcassets/AppIcon.appiconset/Icon-120.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.7 KiB

BIN
DNSecure/Assets.xcassets/AppIcon.appiconset/Icon-121.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.7 KiB

BIN
DNSecure/Assets.xcassets/AppIcon.appiconset/Icon-152.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.7 KiB

BIN
DNSecure/Assets.xcassets/AppIcon.appiconset/Icon-167.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.3 KiB

BIN
DNSecure/Assets.xcassets/AppIcon.appiconset/Icon-180.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.7 KiB

BIN
DNSecure/Assets.xcassets/AppIcon.appiconset/Icon-20.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 657 B

BIN
DNSecure/Assets.xcassets/AppIcon.appiconset/Icon-29.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 902 B

BIN
DNSecure/Assets.xcassets/AppIcon.appiconset/Icon-40.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
DNSecure/Assets.xcassets/AppIcon.appiconset/Icon-41.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
DNSecure/Assets.xcassets/AppIcon.appiconset/Icon-42.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
DNSecure/Assets.xcassets/AppIcon.appiconset/Icon-58.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
DNSecure/Assets.xcassets/AppIcon.appiconset/Icon-59.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
DNSecure/Assets.xcassets/AppIcon.appiconset/Icon-60.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
DNSecure/Assets.xcassets/AppIcon.appiconset/Icon-76.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
DNSecure/Assets.xcassets/AppIcon.appiconset/Icon-80.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.5 KiB

BIN
DNSecure/Assets.xcassets/AppIcon.appiconset/Icon-81.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.5 KiB

BIN
DNSecure/Assets.xcassets/AppIcon.appiconset/Icon-87.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.7 KiB

BIN
DNSecure/Assets.xcassets/HowToActivate/AllDone.imageset/AllDone.png vendored
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 581 KiB

21
DNSecure/Assets.xcassets/HowToActivate/AllDone.imageset/Contents.json vendored
View file

@ -1,21 +0,0 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "AllDone.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

21
DNSecure/Assets.xcassets/HowToActivate/FiltersSettings.imageset/Contents.json vendored
View file

@ -1,21 +0,0 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "FiltersSettings.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

BIN
DNSecure/Assets.xcassets/HowToActivate/FiltersSettings.imageset/FiltersSettings.png vendored
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 498 KiB

21
DNSecure/Assets.xcassets/HowToActivate/MakeItEnabled.imageset/Contents.json vendored
View file

@ -1,21 +0,0 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "MakeItEnabled.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

BIN
DNSecure/Assets.xcassets/HowToActivate/MakeItEnabled.imageset/MakeItEnabled.png vendored
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 28 KiB

0
DNSecure/Assets.xcassets/HowToActivate/MontereyMakeServiceActive.imageset/Contents.json → DNSecure/Assets.xcassets/HowToActivate/MakeServiceActive.imageset/Contents.json vendored
View file

0
DNSecure/Assets.xcassets/HowToActivate/MontereyMakeServiceActive.imageset/IMG_0244.jpg → DNSecure/Assets.xcassets/HowToActivate/MakeServiceActive.imageset/IMG_0244.jpg vendored
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 44 KiB

After

Width:  |  Height:  |  Size: 44 KiB

21
DNSecure/Assets.xcassets/HowToActivate/MontereyNetworkSettings.imageset/Contents.json vendored
View file

@ -1,21 +0,0 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "Screen Shot 2021-02-13 at 11.25.16 AM.jpg",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

2
DNSecure/Assets.xcassets/HowToActivate/NetworkSettings.imageset/Contents.json vendored
View file

@ -5,7 +5,7 @@
"scale" : "1x"
},
{
"filename" : "NetworkSettings.png",
"filename" : "Screen Shot 2021-02-13 at 11.25.16 AM.jpg",
"idiom" : "universal",
"scale" : "2x"
},

BIN
DNSecure/Assets.xcassets/HowToActivate/NetworkSettings.imageset/NetworkSettings.png vendored
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 517 KiB

0
DNSecure/Assets.xcassets/HowToActivate/MontereyNetworkSettings.imageset/Screen Shot 2021-02-13 at 11.25.16 AM.jpg → DNSecure/Assets.xcassets/HowToActivate/NetworkSettings.imageset/Screen Shot 2021-02-13 at 11.25.16 AM.jpg vendored
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 155 KiB

After

Width:  |  Height:  |  Size: 155 KiB

0
DNSecure/Assets.xcassets/HowToActivate/MontereyNetworkSettingsApply.imageset/Contents.json → DNSecure/Assets.xcassets/HowToActivate/NetworkSettingsApply.imageset/Contents.json vendored
View file

0
DNSecure/Assets.xcassets/HowToActivate/MontereyNetworkSettingsApply.imageset/Image 2-13-21 at 12.10 PM.jpg → DNSecure/Assets.xcassets/HowToActivate/NetworkSettingsApply.imageset/Image 2-13-21 at 12.10 PM.jpg vendored
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 69 KiB

After

Width:  |  Height:  |  Size: 69 KiB

0
DNSecure/Assets.xcassets/HowToActivate/MontereySystemPreferences.imageset/Contents.json → DNSecure/Assets.xcassets/HowToActivate/SystemPreferences.imageset/Contents.json vendored
View file

0
DNSecure/Assets.xcassets/HowToActivate/MontereySystemPreferences.imageset/Screen Shot 2021-02-13 at 11.36.47 AM.jpg → DNSecure/Assets.xcassets/HowToActivate/SystemPreferences.imageset/Screen Shot 2021-02-13 at 11.36.47 AM.jpg vendored
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 198 KiB

After

Width:  |  Height:  |  Size: 198 KiB

0
DNSecure/Assets.xcassets/HowToActivate/MontereySystemPreferencesIcon.imageset/Contents.json → DNSecure/Assets.xcassets/HowToActivate/SystemPreferencesIcon.imageset/Contents.json vendored
View file

0
DNSecure/Assets.xcassets/HowToActivate/MontereySystemPreferencesIcon.imageset/IMG_0250.jpg → DNSecure/Assets.xcassets/HowToActivate/SystemPreferencesIcon.imageset/IMG_0250.jpg vendored
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 73 KiB

After

Width:  |  Height:  |  Size: 73 KiB

21
DNSecure/Assets.xcassets/HowToActivate/SystemSettingsIcon.imageset/Contents.json vendored
View file

@ -1,21 +0,0 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "SystemSettingsIcon.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

BIN
DNSecure/Assets.xcassets/HowToActivate/SystemSettingsIcon.imageset/SystemSettingsIcon.png vendored
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 88 KiB

4
DNSecure/DNSecure.entitlements
View file

@ -8,5 +8,9 @@
</array>
<key>com.apple.developer.networking.wifi-info</key>
<true/>
<key>com.apple.security.app-sandbox</key>
<true/>
<key>com.apple.security.network.client</key>
<true/>
</dict>
</plist>

11
DNSecure/DNSecureApp.swift
View file

@ -5,22 +5,15 @@
// Created by Kenta Kubo on 7/1/20.
//
import SwiftUI
import os.log
import SwiftUI
let logger = Logger()
@main
struct DNSecureApp {
@AppStorage("servers") private var servers: Resolvers = []
@AppStorage("servers") private var servers = Presets.servers
@AppStorage("usedID") private var usedID: String?
init() {
if UserDefaults.standard.object(forKey: "servers") == nil {
// Set the default value in order to fix UUIDs
self.servers = Presets.servers
}
}
}
extension DNSecureApp: App {

10
DNSecure/Extensions/NEEvaluateConnectionRuleAction+Codable.swift
View file

@ -1,10 +0,0 @@
//
// NEEvaluateConnectionRuleAction+Codable.swift
// DNSecure
//
// Created by Kenta Kubo on 8/31/25.
//
import NetworkExtension
extension NEEvaluateConnectionRuleAction: @retroactive Codable {}

14
DNSecure/Extensions/NEOnDemandRuleAction+CaseIterable.swift Normal file
View file

@ -0,0 +1,14 @@
//
// NEOnDemandRuleAction+CaseIterable.swift
// DNSecure
//
// Created by Kenta Kubo on 12/20/20.
//
import NetworkExtension
extension NEOnDemandRuleAction: CaseIterable {
public static var allCases: [Self] {
[.connect, .disconnect, .evaluateConnection, .ignore]
}
}

2
DNSecure/Extensions/NEOnDemandRuleAction+Codable.swift
View file

@ -7,4 +7,4 @@
import NetworkExtension
extension NEOnDemandRuleAction: @retroactive Codable {}
extension NEOnDemandRuleAction: Codable {}

17
DNSecure/Extensions/NEOnDemandRuleAction+CustomStringConvertible.swift
View file

@ -7,14 +7,19 @@
import NetworkExtension
extension NEOnDemandRuleAction: @retroactive CustomStringConvertible {
extension NEOnDemandRuleAction: CustomStringConvertible {
public var description: String {
switch self {
case .connect: "Apply settings"
case .disconnect: "Do not apply settings"
case .evaluateConnection: "Apply with excluded domains"
case .ignore: "As is"
@unknown case _: "Unknown"
case .connect:
return "Apply settings"
case .disconnect:
return "Do not apply settings"
case .evaluateConnection:
return "Apply with excluded domains"
case .ignore:
return "As is"
default:
return "Unknown"
}
}
}

6
DNSecure/Extensions/NEOnDemandRuleInterfaceType+CaseIterable.swift
View file

@ -7,12 +7,12 @@
import NetworkExtension
extension NEOnDemandRuleInterfaceType: @retroactive CaseIterable {
extension NEOnDemandRuleInterfaceType: CaseIterable {
public static var allCases: [Self] {
#if os(macOS)
[.any, .ethernet, .wiFi]
return [.any, .ethernet, .wiFi]
#else
[.any, .wiFi, .cellular]
return [.any, .wiFi, .cellular]
#endif
}
}

2
DNSecure/Extensions/NEOnDemandRuleInterfaceType+Codable.swift
View file

@ -7,4 +7,4 @@
import NetworkExtension
extension NEOnDemandRuleInterfaceType: @retroactive Codable {}
extension NEOnDemandRuleInterfaceType: Codable {}

17
DNSecure/Extensions/NEOnDemandRuleInterfaceType+CustomStringConvertible.swift
View file

@ -7,18 +7,23 @@
import NetworkExtension
extension NEOnDemandRuleInterfaceType: @retroactive CustomStringConvertible {
extension NEOnDemandRuleInterfaceType: CustomStringConvertible {
public var description: String {
switch self {
case .any: "Any"
case .any:
return "Any"
#if os(macOS)
case .ethernet: "Ethernet"
case .ethernet:
return "Ethernet"
#endif
case .wiFi: "Wi-Fi"
case .wiFi:
return "Wi-Fi"
#if os(iOS)
case .cellular: "Cellular"
case .cellular:
return "Cellular"
#endif
@unknown case _: "Unknown"
default:
return "Unknown"
}
}
}

17
DNSecure/Extensions/NEOnDemandRuleInterfaceType+isSSIDUsed.swift
View file

@ -1,17 +0,0 @@
//
// NEOnDemandRuleInterfaceType+isSSIDUsed.swift
// DNSecure
//
// Created by Kenta Kubo on 12/20/20.
//
import NetworkExtension
extension NEOnDemandRuleInterfaceType {
var isSSIDUsed: Bool {
switch self {
case .any, .wiFi: true
case _: false
}
}
}

19
DNSecure/Extensions/NEOnDemandRuleInterfaceType+ssidIsUsed.swift Normal file
View file

@ -0,0 +1,19 @@
//
// NEOnDemandRuleInterfaceType+ssidIsUsed.swift
// DNSecure
//
// Created by Kenta Kubo on 12/20/20.
//
import NetworkExtension
extension NEOnDemandRuleInterfaceType {
var ssidIsUsed: Bool {
switch self {
case .any, .wiFi:
return true
default:
return false
}
}
}

41
DNSecure/Info.plist
View file

@ -2,10 +2,51 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key>
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
<key>CFBundleShortVersionString</key>
<string>$(MARKETING_VERSION)</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.utilities</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>UIApplicationSceneManifest</key>
<dict>
<key>UIApplicationSupportsMultipleScenes</key>
<false/>
</dict>
<key>UIApplicationSupportsIndirectInputEvents</key>
<true/>
<key>UILaunchScreen</key>
<dict/>
<key>UIRequiredDeviceCapabilities</key>
<array>
<string>armv7</string>
</array>
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
<key>UISupportedInterfaceOrientations~ipad</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationPortraitUpsideDown</string>
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
</dict>
</plist>

86
DNSecure/Models/OnDemandRule.swift
View file

@ -1,86 +0,0 @@
//
// OnDemandRule.swift
// DNSecure
//
// Created by Kenta Kubo on 8/31/25.
//
import Foundation
import NetworkExtension
struct OnDemandRule {
var id = UUID()
var name: String
var action: NEOnDemandRuleAction = .connect
var interfaceType: NEOnDemandRuleInterfaceType = .any
var ssidMatch: [String] = []
var dnsSearchDomainMatch: [String] = []
var dnsServerAddressMatch: [String] = []
var probeURL: URL?
var excludedDomains: [String]?
}
extension OnDemandRule: Identifiable {}
extension OnDemandRule: Equatable {}
extension OnDemandRule: Hashable {}
extension OnDemandRule: Codable {}
extension [OnDemandRule] {
func toNEOnDemandRules() -> [NEOnDemandRule] {
self.map { rule in
switch rule.action {
case .connect:
let newRule = NEOnDemandRuleConnect()
newRule.interfaceTypeMatch = rule.interfaceType
if rule.interfaceType.isSSIDUsed {
newRule.ssidMatch = rule.ssidMatch
}
newRule.dnsSearchDomainMatch = rule.dnsSearchDomainMatch
newRule.dnsServerAddressMatch = rule.dnsServerAddressMatch
newRule.probeURL = rule.probeURL
return newRule
case .disconnect:
let newRule = NEOnDemandRuleDisconnect()
newRule.interfaceTypeMatch = rule.interfaceType
if rule.interfaceType.isSSIDUsed {
newRule.ssidMatch = rule.ssidMatch
}
newRule.dnsSearchDomainMatch = rule.dnsSearchDomainMatch
newRule.dnsServerAddressMatch = rule.dnsServerAddressMatch
newRule.probeURL = rule.probeURL
return newRule
case .evaluateConnection:
let newRule = NEOnDemandRuleEvaluateConnection()
newRule.interfaceTypeMatch = rule.interfaceType
if rule.interfaceType.isSSIDUsed {
newRule.ssidMatch = rule.ssidMatch
}
newRule.dnsSearchDomainMatch = rule.dnsSearchDomainMatch
newRule.dnsServerAddressMatch = rule.dnsServerAddressMatch
newRule.probeURL = rule.probeURL
newRule.connectionRules =
switch rule.excludedDomains {
case let domains? where !domains.isEmpty:
[.init(matchDomains: domains, andAction: .neverConnect)]
case _: []
}
return newRule
case .ignore:
let newRule = NEOnDemandRuleIgnore()
newRule.interfaceTypeMatch = rule.interfaceType
if rule.interfaceType.isSSIDUsed {
newRule.ssidMatch = rule.ssidMatch
}
newRule.dnsSearchDomainMatch = rule.dnsSearchDomainMatch
newRule.dnsServerAddressMatch = rule.dnsServerAddressMatch
newRule.probeURL = rule.probeURL
return newRule
@unknown case _:
preconditionFailure("Unexpected NEOnDemandRuleAction")
}
}
}
}

34
DNSecure/Models/Presets.swift
View file

@ -126,7 +126,7 @@ enum Presets {
configuration: .dnsOverTLS(
DoTConfiguration(
servers: [
"116.202.176.26"
"116.202.176.26",
],
serverName: "dot.libredns.gr"
)
@ -137,7 +137,7 @@ enum Presets {
configuration: .dnsOverHTTPS(
DoHConfiguration(
servers: [
"116.202.176.26"
"116.202.176.26",
],
serverURL: URL(string: "https://doh.libredns.gr/dns-query")
)
@ -148,7 +148,7 @@ enum Presets {
configuration: .dnsOverHTTPS(
DoHConfiguration(
servers: [
"116.202.176.26"
"116.202.176.26",
],
serverURL: URL(string: "https://doh.libredns.gr/ads")
)
@ -210,33 +210,5 @@ enum Presets {
)
)
),
.init(
name: "Freifunk Muenchen DNS",
configuration: .dnsOverTLS(
DoTConfiguration(
servers: [
"5.1.66.255",
"185.150.99.255",
"2001:678:e68:f000::",
"2001:678:ed0:f000::",
],
serverName: "dot.ffmuc.net"
)
)
),
.init(
name: "Freifunk Muenchen DNS",
configuration: .dnsOverHTTPS(
DoHConfiguration(
servers: [
"5.1.66.255",
"185.150.99.255",
"2001:678:e68:f000::",
"2001:678:ed0:f000::",
],
serverURL: URL(string: "https://doh.ffmuc.net/dns-query")
)
)
),
]
}

94
DNSecure/Models/Resolver.swift
View file

@ -48,9 +48,9 @@ enum Configuration {
func toDNSSettings() -> NEDNSSettings {
switch self {
case .dnsOverTLS(let configuration):
case let .dnsOverTLS(configuration):
return configuration.toDNSSettings()
case .dnsOverHTTPS(let configuration):
case let .dnsOverHTTPS(configuration):
return configuration.toDNSSettings()
}
}
@ -87,10 +87,10 @@ extension Configuration: Codable {
var container = encoder.container(keyedBy: Self.CodingKeys.self)
switch self {
case .dnsOverTLS(let configuration):
case let .dnsOverTLS(configuration):
try container.encode(Self.Base.dnsOverTLS, forKey: .base)
try container.encode(configuration, forKey: .dotConfiguration)
case .dnsOverHTTPS(let configuration):
case let .dnsOverHTTPS(configuration):
try container.encode(Self.Base.dnsOverHTTPS, forKey: .base)
try container.encode(configuration, forKey: .dohConfiguration)
}
@ -106,6 +106,77 @@ extension Configuration: CustomStringConvertible {
}
}
struct OnDemandRule {
var id = UUID()
var name: String
var action: NEOnDemandRuleAction = .ignore
var interfaceType: NEOnDemandRuleInterfaceType = .any
var ssidMatch: [String] = []
var dnsSearchDomainMatch: [String] = []
var dnsServerAddressMatch: [String] = []
var probeURL: URL?
}
extension OnDemandRule: Identifiable {}
extension OnDemandRule: Equatable {}
extension OnDemandRule: Hashable {}
extension OnDemandRule: Codable {}
extension Array where Self.Element == OnDemandRule {
func toNEOnDemandRules() -> [NEOnDemandRule] {
self.lazy
.map { rule in
switch rule.action {
case .connect:
let newRule = NEOnDemandRuleConnect()
newRule.interfaceTypeMatch = rule.interfaceType
if rule.interfaceType.ssidIsUsed {
newRule.ssidMatch = rule.ssidMatch
}
newRule.dnsSearchDomainMatch = rule.dnsSearchDomainMatch
newRule.dnsServerAddressMatch = rule.dnsServerAddressMatch
newRule.probeURL = rule.probeURL
return newRule
case .disconnect:
let newRule = NEOnDemandRuleDisconnect()
newRule.interfaceTypeMatch = rule.interfaceType
if rule.interfaceType.ssidIsUsed {
newRule.ssidMatch = rule.ssidMatch
}
newRule.dnsSearchDomainMatch = rule.dnsSearchDomainMatch
newRule.dnsServerAddressMatch = rule.dnsServerAddressMatch
newRule.probeURL = rule.probeURL
return newRule
case .evaluateConnection:
let newRule = NEOnDemandRuleEvaluateConnection()
newRule.interfaceTypeMatch = rule.interfaceType
if rule.interfaceType.ssidIsUsed {
newRule.ssidMatch = rule.ssidMatch
}
newRule.dnsSearchDomainMatch = rule.dnsSearchDomainMatch
newRule.dnsServerAddressMatch = rule.dnsServerAddressMatch
newRule.probeURL = rule.probeURL
return newRule
case .ignore:
let newRule = NEOnDemandRuleIgnore()
newRule.interfaceTypeMatch = rule.interfaceType
if rule.interfaceType.ssidIsUsed {
newRule.ssidMatch = rule.ssidMatch
}
newRule.dnsSearchDomainMatch = rule.dnsSearchDomainMatch
newRule.dnsServerAddressMatch = rule.dnsServerAddressMatch
newRule.probeURL = rule.probeURL
return newRule
default:
preconditionFailure("Unexpected NEOnDemandRuleAction")
}
}
}
}
struct Resolver {
var id = UUID()
var name: String
@ -129,11 +200,10 @@ extension Resolver: Codable {
self.id = try container.decode(UUID.self, forKey: .id)
self.name = try container.decode(String.self, forKey: .name)
self.configuration = try container.decode(Configuration.self, forKey: .configuration)
self.onDemandRules =
try container.decodeIfPresent(
[OnDemandRule].self,
forKey: .onDemandRules
) ?? []
self.onDemandRules = try container.decodeIfPresent(
[OnDemandRule].self,
forKey: .onDemandRules
) ?? []
}
}
@ -145,10 +215,10 @@ extension Resolvers {
}
}
extension Resolvers: @retroactive RawRepresentable {
extension Resolvers: RawRepresentable {
public init?(rawValue: String) {
guard let data = rawValue.data(using: .utf8),
let result = try? JSONDecoder().decode(Self.self, from: data)
let result = try? JSONDecoder().decode(Self.self, from: data)
else {
return nil
}
@ -157,7 +227,7 @@ extension Resolvers: @retroactive RawRepresentable {
public var rawValue: String {
guard let data = try? JSONEncoder().encode(self),
let result = String(data: data, encoding: .utf8)
let result = String(data: data, encoding: .utf8)
else {
return "[]"
}

6
DNSecure/Preview Content/Preview Assets.xcassets/Contents.json Normal file
View file

@ -0,0 +1,6 @@
{
"info" : {
"author" : "xcode",
"version" : 1
}
}

311
DNSecure/Views/ContentView.swift
View file

@ -5,33 +5,19 @@
// Created by Kenta Kubo on 7/1/20.
//
@preconcurrency import NetworkExtension
import NetworkExtension
import SwiftUI
struct ContentView {
@Environment(\.horizontalSizeClass) private var hSizeClass
@Environment(\.scenePhase) private var scenePhase
@Binding var servers: Resolvers
@Binding var usedID: String?
@State private var isActivated = false
@State private var isEnabled = false
@State private var selection: Int?
@State private var isAlertPresented = false
@State private var alertIsPresented = false
@State private var alertTitle = ""
@State private var alertMessage = ""
@State private var isGuidePresented = false
@State private var isRestoring = false
#if targetEnvironment(macCatalyst)
// Workaround for https://github.com/kkebo/DNSecure/issues/139
@State private var sidebarEditMode: EditMode = .inactive
@State private var detailEditMode: EditMode = .inactive
#endif
private var navigationBarTitleDisplayMode: NavigationBarItem.TitleDisplayMode {
if #available(iOS 26, *) {
.inline
} else {
.automatic
}
}
@State private var guideIsPresented = false
private func addNewDoTServer() {
self.servers.append(
@ -53,10 +39,6 @@ struct ContentView {
self.selection = self.servers.count - 1
}
private func restoreFromPresets(resolver: Resolver) {
self.servers.append(resolver)
}
private func removeServers(at indexSet: IndexSet) {
if let current = self.selection, indexSet.contains(where: { $0 <= current }) {
// FIXME: This is a workaround not to crash on deletion.
@ -79,18 +61,13 @@ struct ContentView {
private func updateStatus() {
#if !targetEnvironment(simulator)
// Early return if running on Swift Playground or Xcode Previews
guard ProcessInfo.processInfo.environment["XCODE_RUNNING_FOR_PREVIEWS"] != "1" else {
return
}
let manager = NEDNSSettingsManager.shared()
manager.loadFromPreferences {
if let err = $0 {
logger.error("\(err.localizedDescription)")
self.alert("Load Error", err.localizedDescription)
} else {
self.isActivated = manager.isEnabled
self.isEnabled = manager.isEnabled
}
}
#endif
@ -102,21 +79,13 @@ struct ContentView {
}
#if !targetEnvironment(simulator)
// Early return if running on Swift Playground or Xcode Previews
guard ProcessInfo.processInfo.environment["XCODE_RUNNING_FOR_PREVIEWS"] != "1" else {
return
}
let manager = NEDNSSettingsManager.shared()
manager.localizedDescription = server.name
manager.dnsSettings = server.configuration.toDNSSettings()
manager.onDemandRules = server.onDemandRules.toNEOnDemandRules()
manager.saveToPreferences { saveError in
if let saveError = saveError as NSError? {
guard
saveError.domain != "NEConfigurationErrorDomain"
|| saveError.code != 9
else {
guard saveError.domain != "NEConfigurationErrorDomain"
|| saveError.code != 9 else {
// Nothing was changed
return
}
@ -125,7 +94,7 @@ struct ContentView {
self.removeSettings()
return
}
logger.debug("The DNS settings were saved")
logger.debug("DNS settings was saved")
}
#endif
}
@ -134,11 +103,6 @@ struct ContentView {
self.usedID = nil
#if !targetEnvironment(simulator)
// Early return if running on Swift Playground or Xcode Previews
guard ProcessInfo.processInfo.environment["XCODE_RUNNING_FOR_PREVIEWS"] != "1" else {
return
}
let manager = NEDNSSettingsManager.shared()
guard manager.dnsSettings != nil else {
// Already removed
@ -151,7 +115,7 @@ struct ContentView {
self.alert("Remove Error", removeError.localizedDescription)
return
}
logger.debug("The DNS settings were removed")
logger.debug("DNS settings was removed")
}
#endif
}
@ -159,18 +123,14 @@ struct ContentView {
private func alert(_ title: String, _ message: String) {
self.alertTitle = title
self.alertMessage = message
self.isAlertPresented = true
self.alertIsPresented = true
}
}
@MainActor
extension ContentView: View {
var body: some View {
if #available(iOS 16, *) {
self.modernBody
} else if self.hSizeClass == .compact {
// Workaround for iOS 15
self.legacyBody.navigationViewStyle(.stack)
} else {
self.legacyBody
}
@ -180,9 +140,7 @@ extension ContentView: View {
private var modernBody: some View {
NavigationSplitView {
List(selection: self.$selection) {
if !self.isActivated && self.hSizeClass == .compact {
NavigationLink("Instructions", value: -1)
}
NavigationLink("Instruction", value: -1)
Section("Servers") {
ForEach(0..<self.servers.count, id: \.self) { i in
NavigationLink(value: i) {
@ -194,86 +152,59 @@ extension ContentView: View {
}
}
.navigationTitle(Bundle.main.displayName!)
.navigationBarTitleDisplayMode(self.navigationBarTitleDisplayMode)
.toolbar {
#if canImport(SwiftUI, _version: 7)
if #available(iOS 26, *) {
ToolbarItem(placement: .subtitle) {
self.statusIndicator
.foregroundStyle(.secondary)
}
}
#endif
self.toolbarContent
}
.alert(self.alertTitle, isPresented: self.$isAlertPresented) {
.toolbar { self.toolbarContent }
.alert(self.alertTitle, isPresented: self.$alertIsPresented) {
} message: {
Text(self.alertMessage)
}
#if targetEnvironment(macCatalyst)
// Workaround for https://github.com/kkebo/DNSecure/issues/139
.environment(\.editMode, self.$sidebarEditMode)
#endif
} detail: {
if let i = self.selection, i >= 0 {
NavigationStack {
self.detailView(at: i)
.navigationBarTitleDisplayMode(self.navigationBarTitleDisplayMode)
}
#if targetEnvironment(macCatalyst)
// Workaround for https://github.com/kkebo/DNSecure/issues/139
.environment(\.editMode, self.$detailEditMode)
#endif
} else if !self.isActivated || self.selection == -1 {
HowToActivateView()
.navigationBarTitleDisplayMode(self.navigationBarTitleDisplayMode)
if self.selection == -1 {
HowToActivateView(isSheet: false)
} else if let i = self.selection {
self.detailView(at: i)
} else if !self.isEnabled {
HowToActivateView(isSheet: false)
} else {
Text("Select a server on the sidebar")
.navigationBarTitleDisplayMode(self.navigationBarTitleDisplayMode)
.navigationBarHidden(true)
}
}
.onAppear(perform: self.updateStatus)
.task {
for await _ in NotificationCenter.default
.notifications(named: .NEDNSSettingsConfigurationDidChange)
.map(\.name)
{
.onChange(of: self.scenePhase) { phase in
if phase == .active {
self.updateStatus()
} else if phase == .background {
// FIXME: This is a workaround for self.$severs[i].
// That cannot save settings as soon as it is modified.
guard let id = self.usedID,
let uuid = UUID(uuidString: id),
let server = self.servers.find(by: uuid) else {
return
}
self.saveSettings(of: server)
}
}
}
@available(iOS, deprecated: 16)
private var legacyBody: some View {
NavigationView {
List {
if !self.isActivated && self.hSizeClass == .compact {
NavigationLink(
"Instructions",
tag: -1,
selection: self.$selection
) {
HowToActivateView()
}
NavigationLink(
"Instructions",
tag: -1,
selection: self.$selection
) {
HowToActivateView(isSheet: false)
}
Section("Servers") {
ForEach(0..<self.servers.count, id: \.self) { i in
if self.hSizeClass == .compact {
NavigationLink(
tag: i,
selection: self.$selection
) {
self.detailView(at: i)
} label: {
self.sidebarRow(at: i)
}
} else {
// Workaround for iOS 15
Button {
self.selection = i
} label: {
self.sidebarRow(at: i)
}
NavigationLink(
tag: i,
selection: self.$selection
) {
self.detailView(at: i)
} label: {
self.sidebarRow(at: i)
}
}
.onDelete(perform: self.removeServers)
@ -282,122 +213,87 @@ extension ContentView: View {
}
.navigationTitle(Bundle.main.displayName!)
.toolbar { self.toolbarContent }
.alert(self.alertTitle, isPresented: self.$isAlertPresented) {
.alert(self.alertTitle, isPresented: self.$alertIsPresented) {
} message: {
Text(self.alertMessage)
}
if let i = self.selection, i >= 0 {
self.detailView(at: i)
} else if !self.isActivated || self.selection == -1 {
HowToActivateView()
if !self.isEnabled {
HowToActivateView(isSheet: false)
} else {
Text("Select a server on the sidebar")
.navigationBarHidden(true)
}
}
.onAppear(perform: self.updateStatus)
.task {
for await _ in NotificationCenter.default
.notifications(named: .NEDNSSettingsConfigurationDidChange)
.map(\.name)
{
.onChange(of: self.scenePhase) { phase in
if phase == .active {
self.updateStatus()
} else if phase == .background {
// FIXME: This is a workaround for self.$severs[i].
// That cannot save settings as soon as it is modified.
guard let id = self.usedID,
let uuid = UUID(uuidString: id),
let server = self.servers.find(by: uuid) else {
return
}
self.saveSettings(of: server)
}
}
}
@ToolbarContentBuilder private var toolbarContent: some ToolbarContent {
ToolbarItem(placement: .topBarLeading) {
if #available(iOS 26, *) {
#if targetEnvironment(macCatalyst)
// Workaround for the issue that the checkmark icon is hard to see if System Settings > Appearance > Theme > Color is Multicolor.
Button {
withAnimation {
if !self.sidebarEditMode.isEditing {
self.sidebarEditMode = .active
} else {
self.sidebarEditMode = .inactive
}
}
} label: {
if !self.sidebarEditMode.isEditing {
Text("Edit")
} else {
Label("Done", systemImage: "checkmark")
}
}
.tint(self.sidebarEditMode.isEditing ? .accentColor : .primary)
#else
EditButton()
#endif
} else {
self.addMenu
ToolbarItem(placement: .navigationBarLeading) {
Menu {
Button("DNS-over-TLS", action: self.addNewDoTServer)
Button("DNS-over-HTTPS", action: self.addNewDoHServer)
} label: {
Image(systemName: "plus")
}
}
ToolbarItem(placement: .topBarTrailing) {
if #available(iOS 26, *) {
self.addMenu
} else {
EditButton()
}
ToolbarItem(placement: .navigationBarTrailing) {
EditButton()
}
ToolbarItem(placement: .status) {
if #available(iOS 26, *) {
#if !canImport(SwiftUI, _version: 7)
self.statusIndicator
#endif
} else {
self.statusIndicator
}
}
}
private var addMenu: some View {
Menu("Add", systemImage: "plus") {
Button("DNS-over-TLS", action: self.addNewDoTServer)
Button("DNS-over-HTTPS", action: self.addNewDoHServer)
Button("Restore from Presets") {
self.isRestoring = true
}
}
.sheet(isPresented: self.$isRestoring) {
RestorationView(onAdd: self.restoreFromPresets)
}
}
private var statusIndicator: some View {
Label {
Text(self.isActivated ? "Active" : "Inactive")
} icon: {
Circle()
.fill(self.isActivated ? .green : .secondary)
.frame(width: 10, height: 10)
}
.labelStyle(.titleAndIcon)
}
private func sidebarRow(at i: Int) -> some View {
HStack {
VStack(alignment: .leading) {
Text(self.servers[i].name)
Text(self.servers[i].configuration.description)
.foregroundStyle(.secondary)
}
if self.usedID == self.servers[i].id.uuidString {
Spacer()
if !self.isActivated {
Image(systemName: "exclamationmark.triangle")
.foregroundStyle(.red)
VStack {
HStack {
Circle()
.frame(width: 10, height: 10)
.foregroundColor(self.isEnabled ? .green : .secondary)
Text(self.isEnabled ? "Active" : "Inactive")
#if targetEnvironment(macCatalyst)
Text("-")
Button("Refresh", action: self.updateStatus)
#endif
}
if !self.isEnabled {
Button("How to Activate") {
self.guideIsPresented = true
}
.sheet(isPresented: self.$guideIsPresented) {
HowToActivateView(isSheet: true)
}
}
Image(systemName: "checkmark")
}
}
}
@ViewBuilder private func sidebarRow(at i: Int) -> some View {
VStack(alignment: .leading) {
Text(self.servers[i].name)
Text(self.servers[i].configuration.description)
.foregroundColor(.secondary)
}
if self.usedID == self.servers[i].id.uuidString {
Spacer()
Image(systemName: "checkmark")
}
}
private func detailView(at i: Int) -> some View {
DetailView(
server: self.$servers[i],
isSelected: .init(
isOn: .init(
get: {
self.usedID == self.servers[i].id.uuidString
},
@ -408,12 +304,13 @@ extension ContentView: View {
self.removeSettings()
}
}
),
isActivated: self.$isActivated
)
)
}
}
#Preview {
ContentView(servers: .constant(Presets.servers), usedID: .constant(nil))
struct ContentView_Previews: PreviewProvider {
static var previews: some View {
ContentView(servers: .constant(Presets.servers), usedID: .constant(nil))
}
}

50
DNSecure/Views/DNSSearchDomainMatchView.swift
View file

@ -1,50 +0,0 @@
import NetworkExtension
import SwiftUI
struct DNSSearchDomainMatchView {
@Binding var rule: OnDemandRule
}
extension DNSSearchDomainMatchView: View {
var body: some View {
Form {
Section {
ForEach(0..<self.rule.dnsSearchDomainMatch.count, id: \.self) { i in
LazyTextField(
"Search Domain",
// self.$rule.dnsSearchDomainMatch[i] causes crash on deletion
text: .init(
get: { self.rule.dnsSearchDomainMatch[i] },
set: { self.rule.dnsSearchDomainMatch[i] = $0 }
)
)
.textContentType(.URL)
.keyboardType(.URL)
.textInputAutocapitalization(.never)
.autocorrectionDisabled()
}
.onDelete { self.rule.dnsSearchDomainMatch.remove(atOffsets: $0) }
.onMove { self.rule.dnsSearchDomainMatch.move(fromOffsets: $0, toOffset: $1) }
Button("Add DNS Search Domain") {
self.rule.dnsSearchDomainMatch.append("")
}
} footer: {
Text(
"If the current default search domain is equal to one of the strings in this array and all of the other conditions in the rule match, then the rule matches."
)
}
}
.navigationTitle("DNS Search Domain Match")
.toolbar {
EditButton()
}
}
}
@available(iOS 17, *)
#Preview {
@Previewable @State var rule = OnDemandRule(name: "Preview Rule")
NavigationStack {
DNSSearchDomainMatchView(rule: $rule)
}
}

50
DNSecure/Views/DNSServerAddressMatchView.swift
View file

@ -1,50 +0,0 @@
import NetworkExtension
import SwiftUI
struct DNSServerAddressMatchView {
@Binding var rule: OnDemandRule
}
extension DNSServerAddressMatchView: View {
var body: some View {
Form {
Section {
ForEach(0..<self.rule.dnsServerAddressMatch.count, id: \.self) { i in
LazyTextField(
"IP Address",
// self.$rule.dnsServerAddressMatch[i] causes crash on deletion
text: .init(
get: { self.rule.dnsServerAddressMatch[i] },
set: { self.rule.dnsServerAddressMatch[i] = $0 }
)
)
.textContentType(.URL)
.keyboardType(.numbersAndPunctuation)
.textInputAutocapitalization(.never)
.autocorrectionDisabled()
}
.onDelete { self.rule.dnsServerAddressMatch.remove(atOffsets: $0) }
.onMove { self.rule.dnsServerAddressMatch.move(fromOffsets: $0, toOffset: $1) }
Button("Add DNS Server Address") {
self.rule.dnsServerAddressMatch.append("")
}
} footer: {
Text(
"If each of the current default DNS servers is equal to one of the strings in this array and all of the other conditions in the rule match, then the rule matches."
)
}
}
.navigationTitle("DNS Server Address Match")
.toolbar {
EditButton()
}
}
}
@available(iOS 17, *)
#Preview {
@Previewable @State var rule = OnDemandRule(name: "Preview Rule")
NavigationStack {
DNSServerAddressMatchView(rule: $rule)
}
}

148
DNSecure/Views/DetailView.swift
View file

@ -9,65 +9,85 @@ import SwiftUI
struct DetailView {
@Binding var server: Resolver
@Binding var isSelected: Bool
@Binding var isActivated: Bool
@State private var isGuidePresented = false
@Binding var isOn: Bool
private func binding(for id: UUID) -> Binding<OnDemandRule> {
guard let index = self.server.onDemandRules.map(\.id).firstIndex(of: id) else {
private func binding(for rule: OnDemandRule) -> Binding<OnDemandRule> {
guard let index = self.server.onDemandRules.firstIndex(of: rule) else {
preconditionFailure("Can't find rule in array")
}
return self.$server.onDemandRules[index]
}
}
@MainActor
extension DetailView: View {
var body: some View {
Form {
Section {
Toggle("Use This Server", isOn: self.$isSelected)
if self.isSelected && !self.isActivated {
Button("One more step is required.", systemImage: "exclamationmark.triangle") {
self.isGuidePresented = true
}
.labelStyle(.titleAndIcon)
.tint(.red)
.sheet(isPresented: self.$isGuidePresented) {
NavigationView {
HowToActivateView()
.toolbar {
ToolbarItem(placement: .cancellationAction) {
#if canImport(SwiftUI, _version: 7)
if #available(iOS 26, *) {
Button("Close", systemImage: "xmark", role: .close) {
self.isGuidePresented = false
}
} else {
Button("Close", systemImage: "xmark", role: .cancel) {
self.isGuidePresented = false
}
}
#else
Button("Close", systemImage: "xmark", role: .cancel) {
self.isGuidePresented = false
}
#endif
}
}
}
.navigationViewStyle(.stack)
if #available(iOS 16, *) {
self.modernBody
} else {
self.legacyBody
}
}
@available(iOS 16, *)
private var modernBody: some View {
NavigationStack {
Form {
Section {
Toggle("Use This Server", isOn: self.$isOn)
}
Section {
HStack {
Text("Name")
TextField("Name", text: self.$server.name)
.multilineTextAlignment(.trailing)
}
}
self.serverConfigurationSections
Section {
ForEach(self.server.onDemandRules) { rule in
NavigationLink(rule.name, value: rule)
}
.onDelete { self.server.onDemandRules.remove(atOffsets: $0) }
.onMove { self.server.onDemandRules.move(fromOffsets: $0, toOffset: $1) }
Button("Add New Rule") {
self.server.onDemandRules
.append(OnDemandRule(name: "New Rule"))
}
} header: {
EditButton()
.frame(maxWidth: .infinity, alignment: .trailing)
.overlay(alignment: .leading) {
Text("On Demand Rules")
}
}
}
Section("Name") {
LazyTextField("Name", text: self.$server.name)
.navigationDestination(for: OnDemandRule.self) { rule in
// When RuleView is opened and tap another server on the sidebar, the previous server's rule comes here.
if self.server.onDemandRules.contains(rule) {
RuleView(rule: self.binding(for: rule))
}
}
}
.navigationTitle(self.server.name)
}
private var legacyBody: some View {
Form {
Section {
Toggle("Use This Server", isOn: self.$isOn)
}
Section {
HStack {
Text("Name")
TextField("Name", text: self.$server.name)
.multilineTextAlignment(.trailing)
}
}
self.serverConfigurationSections
Section {
ForEach(self.server.onDemandRules) { rule in
NavigationLink(rule.name) {
RuleView(rule: self.binding(for: rule.id))
RuleView(rule: self.binding(for: rule))
}
}
.onDelete { self.server.onDemandRules.remove(atOffsets: $0) }
@ -80,47 +100,33 @@ extension DetailView: View {
EditButton()
.frame(maxWidth: .infinity, alignment: .trailing)
.overlay(alignment: .leading) {
Text("On-Demand Rules")
Text("On Demand Rules")
}
}
}
.navigationTitle(self.server.name)
.onChange(of: self.server) { [oldValue = self.server] newValue in
guard self.isSelected, oldValue.id == newValue.id else { return }
// When the selected server's configuration is modified, the server will be deactivated or deselected so that the user can save the changes by toggling the “Use This Server” switch again.
self.isSelected = false
}
}
@ViewBuilder private var serverConfigurationSections: some View {
switch self.server.configuration {
case .dnsOverTLS(let configuration):
DoTSections(
configuration: .init(
get: { configuration },
set: { self.server.configuration = .dnsOverTLS($0) }
)
)
DoTSections(server: self.$server, configuration: configuration)
case .dnsOverHTTPS(let configuration):
DoHSections(
configuration: .init(
get: { configuration },
set: { self.server.configuration = .dnsOverHTTPS($0) }
)
)
DoHSections(server: self.$server, configuration: configuration)
}
}
}
#Preview {
DetailView(
server: .constant(
.init(
name: "My Server",
configuration: .dnsOverTLS(DoTConfiguration())
)
),
isSelected: .constant(true),
isActivated: .constant(true)
)
struct DetailView_Previews: PreviewProvider {
static var previews: some View {
DetailView(
server: .constant(
.init(
name: "My Server",
configuration: .dnsOverTLS(DoTConfiguration())
)
),
isOn: .constant(true)
)
}
}

124
DNSecure/Views/DoHSections.swift
View file

@ -7,24 +7,52 @@
import SwiftUI
private enum FocusedField {
case address
case serverURL
}
struct DoHSections {
@Binding var configuration: DoHConfiguration
@Binding var server: Resolver
@State var configuration: DoHConfiguration
@FocusState private var focusedField: FocusedField?
private func commit() {
self.server.configuration = .dnsOverHTTPS(self.configuration)
}
}
extension DoHSections: View {
var body: some View {
Section {
ForEach(0..<self.configuration.servers.count, id: \.self) { i in
LazyTextField("IP address", text: self.$configuration.servers[i])
.textContentType(.URL)
.keyboardType(.numbersAndPunctuation)
.textInputAutocapitalization(.never)
.autocorrectionDisabled()
TextField(
"IP address",
text: .init(
get: { self.configuration.servers[i] },
set: {
self.configuration.servers[i] = $0
.trimmingCharacters(in: .whitespacesAndNewlines)
}
)
)
.focused(self.$focusedField, equals: .address)
.textContentType(.URL)
.keyboardType(.numbersAndPunctuation)
.autocapitalization(.none)
.disableAutocorrection(true)
}
.onDelete {
self.configuration.servers.remove(atOffsets: $0)
self.commit()
}
.onMove {
self.configuration.servers.move(fromOffsets: $0, toOffset: $1)
self.commit()
}
.onDelete { self.configuration.servers.remove(atOffsets: $0) }
.onMove { self.configuration.servers.move(fromOffsets: $0, toOffset: $1) }
Button("Add New Server") {
self.configuration.servers.append("")
configuration.servers.append("")
self.commit()
}
} header: {
EditButton()
@ -36,39 +64,67 @@ extension DoHSections: View {
Text("The DNS server IP addresses.")
}
Section {
LazyTextField(
"Server URL",
text: .init(
get: { self.configuration.serverURL?.absoluteString ?? "" },
set: { self.configuration.serverURL = URL(string: $0) }
HStack {
Text("Server URL")
Spacer()
TextField(
"Server URL",
text: .init(
get: {
configuration.serverURL?.absoluteString ?? ""
},
set: {
configuration.serverURL = URL(
string: $0.trimmingCharacters(in: .whitespacesAndNewlines)
)
}
)
)
)
.textContentType(.URL)
.keyboardType(.URL)
.textInputAutocapitalization(.never)
.autocorrectionDisabled()
.focused(self.$focusedField, equals: .serverURL)
.multilineTextAlignment(.trailing)
.textContentType(.URL)
.keyboardType(.URL)
.autocapitalization(.none)
.disableAutocorrection(true)
}
} header: {
Text("Server URL")
Text("DNS-over-HTTPS Settings")
} footer: {
Text("The URL of a DNS-over-HTTPS server.")
}
.onChange(of: self.focusedField) { newValue in
if newValue == nil {
self.commit()
}
}
.onChange(of: self.server) { server in
switch server.configuration {
case .dnsOverTLS:
preconditionFailure("unreachable")
case .dnsOverHTTPS(let configuration):
self.configuration = configuration
}
}
.onDisappear {
self.commit()
}
}
}
#Preview {
Form {
DoHSections(
configuration: .constant(
.init(
servers: [
"1.1.1.1",
"1.0.0.1",
"2606:4700:4700::1111",
"2606:4700:4700::1001",
],
serverURL: URL(string: "https://cloudflare-dns.com/dns-query")
)
)
struct DoHSections_Previews: PreviewProvider {
static var previews: some View {
let configuration = DoHConfiguration(
servers: [
"1.1.1.1",
"1.0.0.1",
"2606:4700:4700::1111",
"2606:4700:4700::1001",
],
serverURL: URL(string: "https://cloudflare-dns.com/dns-query")
)
let resolver = Resolver(name: "1.1.1.1", configuration: .dnsOverHTTPS(configuration))
Form {
DoHSections(server: .constant(resolver), configuration: configuration)
}
}
}

119
DNSecure/Views/DoTSections.swift
View file

@ -7,24 +7,52 @@
import SwiftUI
private enum FocusedField {
case address
case serverName
}
struct DoTSections {
@Binding var configuration: DoTConfiguration
@Binding var server: Resolver
@State var configuration: DoTConfiguration
@FocusState private var focusedField: FocusedField?
private func commit() {
self.server.configuration = .dnsOverTLS(self.configuration)
}
}
extension DoTSections: View {
var body: some View {
Section {
ForEach(0..<self.configuration.servers.count, id: \.self) { i in
LazyTextField("IP address", text: self.$configuration.servers[i])
.textContentType(.URL)
.keyboardType(.numbersAndPunctuation)
.textInputAutocapitalization(.never)
.autocorrectionDisabled()
TextField(
"IP address",
text: .init(
get: { self.configuration.servers[i] },
set: {
self.configuration.servers[i] = $0
.trimmingCharacters(in: .whitespacesAndNewlines)
}
)
)
.focused(self.$focusedField, equals: .address)
.textContentType(.URL)
.keyboardType(.numbersAndPunctuation)
.autocapitalization(.none)
.disableAutocorrection(true)
}
.onDelete {
self.configuration.servers.remove(atOffsets: $0)
self.commit()
}
.onMove {
self.configuration.servers.move(fromOffsets: $0, toOffset: $1)
self.commit()
}
.onDelete { self.configuration.servers.remove(atOffsets: $0) }
.onMove { self.configuration.servers.move(fromOffsets: $0, toOffset: $1) }
Button("Add New Server") {
self.configuration.servers.append("")
self.commit()
}
} header: {
EditButton()
@ -36,39 +64,64 @@ extension DoTSections: View {
Text("The DNS server IP addresses.")
}
Section {
LazyTextField(
"Server Name",
text: .init(
get: { self.configuration.serverName ?? "" },
set: { self.configuration.serverName = $0 }
HStack {
Text("Server Name")
Spacer()
TextField(
"Server Name",
text: .init(
get: { self.configuration.serverName ?? "" },
set: {
self.configuration.serverName = $0
.trimmingCharacters(in: .whitespacesAndNewlines)
}
)
)
)
.textContentType(.URL)
.keyboardType(.URL)
.textInputAutocapitalization(.never)
.autocorrectionDisabled()
.focused(self.$focusedField, equals: .serverName)
.multilineTextAlignment(.trailing)
.textContentType(.URL)
.keyboardType(.URL)
.autocapitalization(.none)
.disableAutocorrection(true)
}
} header: {
Text("Server Name")
Text("DNS-over-TLS Settings")
} footer: {
Text("The TLS name of a DNS-over-TLS server.")
}
.onChange(of: self.focusedField) { newValue in
if newValue == nil {
self.commit()
}
}
.onChange(of: self.server) { server in
switch server.configuration {
case .dnsOverTLS(let configuration):
self.configuration = configuration
case .dnsOverHTTPS:
preconditionFailure("unreachable")
}
}
.onDisappear {
self.commit()
}
}
}
#Preview {
Form {
DoTSections(
configuration: .constant(
.init(
servers: [
"1.1.1.1",
"1.0.0.1",
"2606:4700:4700::1111",
"2606:4700:4700::1001",
],
serverName: "cloudflare-dns.com"
)
)
struct DoTSections_Previews: PreviewProvider {
static var previews: some View {
let configuration = DoTConfiguration(
servers: [
"1.1.1.1",
"1.0.0.1",
"2606:4700:4700::1111",
"2606:4700:4700::1001",
],
serverName: "cloudflare-dns.com"
)
let resolver = Resolver(name: "1.1.1.1", configuration: .dnsOverTLS(configuration))
Form {
DoTSections(server: .constant(resolver), configuration: configuration)
}
}
}

49
DNSecure/Views/ExcludedDomainsView.swift
View file

@ -1,49 +0,0 @@
import SwiftUI
struct ExcludedDomainsView {
@Binding var domains: [String]
}
extension ExcludedDomainsView: View {
var body: some View {
Form {
Section {
ForEach(0..<self.domains.count, id: \.self) { i in
LazyTextField(
"Domain",
// self.$rule.excludedDomains[i] causes crash on deletion
text: .init(
get: { self.domains[i] },
set: { self.domains[i] = $0 }
)
)
.textContentType(.URL)
.keyboardType(.URL)
.textInputAutocapitalization(.never)
.autocorrectionDisabled()
}
.onDelete { self.domains.remove(atOffsets: $0) }
.onMove { self.domains.move(fromOffsets: $0, toOffset: $1) }
Button("Add Domain") {
self.domains.append("")
}
} footer: {
Text(
"Each domain is matched against the destination hostname using suffix matching, and each label in the domain must match an entire label in the hostname. For example, the domain `example.com` will match the hostname `www.example.com` but not `www.anotherexample.com`."
)
}
}
.navigationTitle("Excluded Domains")
.toolbar {
EditButton()
}
}
}
@available(iOS 17, *)
#Preview {
@Previewable @State var domains = ["example.com"]
NavigationStack {
ExcludedDomainsView(domains: $domains)
}
}

153
DNSecure/Views/HowToActivateView.swift
View file

@ -7,27 +7,20 @@
import SwiftUI
private enum MacOSVersion {
case venturaOrLater
case monterey
}
struct HowToActivateView {
@State private var macOSVersion: MacOSVersion = .venturaOrLater
@Environment(\.dismiss) private var dismiss
let isSheet: Bool
}
extension HowToActivateView: View {
var body: some View {
ScrollView {
VStack {
#if targetEnvironment(macCatalyst)
Picker("", selection: self.$macOSVersion) {
Text("macOS 13 or later").tag(MacOSVersion.venturaOrLater)
Text("macOS 12").tag(MacOSVersion.monterey)
}
.pickerStyle(.segmented)
.fixedSize()
#endif
VStack {
if self.isSheet {
Text("How to Activate")
.font(.title)
Spacer()
}
ScrollView {
VStack(alignment: .leading) {
VStack(alignment: .leading) {
Text("1. Select a DNS server you like, or add another one")
@ -44,81 +37,44 @@ extension HowToActivateView: View {
.frame(maxHeight: 200)
}
#if targetEnvironment(macCatalyst)
switch self.macOSVersion {
case .venturaOrLater:
VStack(alignment: .leading) {
Text("3. Open the System Settings")
Image(.systemSettingsIcon)
.resizable()
.scaledToFit()
.frame(maxHeight: 200)
}
VStack(alignment: .leading) {
Text("4. Go to Network settings and click \"Filters\"")
Image(.networkSettings)
.resizable()
.scaledToFit()
.frame(maxHeight: 400)
}
VStack(alignment: .leading) {
Text("5. Click on the status of \"\(Bundle.main.displayName!)\"")
Image(.filtersSettings)
.resizable()
.scaledToFit()
.frame(maxHeight: 400)
}
VStack(alignment: .leading) {
Text("6. Click \"Enabled\"")
Image(.makeItEnabled)
.resizable()
.scaledToFit()
.frame(maxHeight: 200)
}
VStack(alignment: .leading) {
Text("7. All done 🎉")
Image(.allDone)
.resizable()
.scaledToFit()
.frame(maxHeight: 400)
}
case .monterey:
VStack(alignment: .leading) {
Text("3. Open the System Preferences")
Image(.montereySystemPreferencesIcon)
.resizable()
.scaledToFit()
.frame(maxHeight: 200)
}
VStack(alignment: .leading) {
Text("4. Go to Network settings")
Image(.montereySystemPreferences)
.resizable()
.scaledToFit()
.frame(maxHeight: 400)
}
VStack(alignment: .leading) {
Text(
"5. Select \"\(Bundle.main.displayName!)\" and click \(Image(systemName: "ellipsis.circle")) button"
)
Image(.montereyNetworkSettings)
.resizable()
.scaledToFit()
.frame(maxHeight: 400)
}
VStack(alignment: .leading) {
Text("6. Click \"Make Service Active\"")
Image(.montereyMakeServiceActive)
.resizable()
.scaledToFit()
.frame(maxHeight: 200)
}
VStack(alignment: .leading) {
Text("7. Click \"Apply\" button")
Image(.montereyNetworkSettingsApply)
.resizable()
.scaledToFit()
.frame(maxHeight: 400)
VStack(alignment: .leading) {
Text("3. Open the System Preferences")
Image("SystemPreferencesIcon")
.resizable()
.scaledToFit()
.frame(maxHeight: 200)
}
VStack(alignment: .leading) {
Text("4. Go to Network settings")
Image("SystemPreferences")
.resizable()
.scaledToFit()
.frame(maxHeight: 400)
}
VStack(alignment: .leading) {
HStack {
Text("5. Select \"\(Bundle.main.displayName!)\" and click")
Image(systemName: "ellipsis.circle")
Text("button")
}
Image("NetworkSettings")
.resizable()
.scaledToFit()
.frame(maxHeight: 400)
}
VStack(alignment: .leading) {
Text("6. Click \"Make Service Active\"")
Image("MakeServiceActive")
.resizable()
.scaledToFit()
.frame(maxHeight: 200)
}
VStack(alignment: .leading) {
Text("7. Click \"Apply\" button")
Image("NetworkSettingsApply")
.resizable()
.scaledToFit()
.frame(maxHeight: 400)
}
#else
VStack(alignment: .leading) {
@ -153,12 +109,23 @@ extension HowToActivateView: View {
#endif
}
}
.padding()
if self.isSheet {
Spacer()
Button {
self.dismiss()
} label: {
Text("Dismiss").padding()
}
.buttonStyle(.borderedProminent)
}
}
.padding()
.navigationTitle("How to Activate")
}
}
#Preview {
HowToActivateView()
struct HowToActivateView_Previews: PreviewProvider {
static var previews: some View {
HowToActivateView(isSheet: true)
}
}

35
DNSecure/Views/InterfaceTypeMatchView.swift
View file

@ -1,35 +0,0 @@
import NetworkExtension
import SwiftUI
struct InterfaceTypeMatchView {
@Binding var rule: OnDemandRule
}
extension InterfaceTypeMatchView: View {
var body: some View {
Form {
Section {
Picker("Interface Type", selection: self.$rule.interfaceType) {
ForEach(NEOnDemandRuleInterfaceType.allCases, id: \.self) {
Text($0.description)
}
}
.pickerStyle(.inline)
.labelsHidden()
} footer: {
Text(
"If the current primary network interface is of this type and all of the other conditions in the rule match, then the rule matches."
)
}
}
.navigationTitle("Interface Type Match")
}
}
@available(iOS 17, *)
#Preview {
@Previewable @State var rule = OnDemandRule(name: "Preview Rule")
NavigationStack {
InterfaceTypeMatchView(rule: $rule)
}
}

53
DNSecure/Views/LazyTextField.swift
View file

@ -1,53 +0,0 @@
//
// LazyTextField.swift
// DNSecure
//
// Created by Kenta Kubo on 4/25/23.
//
import SwiftUI
struct LazyTextField {
private let title: String
@Binding private var text: String
@State private var localText: String
@FocusState private var isFocused
init(_ title: some StringProtocol, text: Binding<String>) {
self.title = String(title)
self._text = text
self._localText = .init(initialValue: text.wrappedValue)
}
}
extension LazyTextField: View {
var body: some View {
HStack {
TextField(self.title, text: self.$localText)
.focused(self.$isFocused)
if self.isFocused && !self.localText.isEmpty {
Button("Clear", systemImage: "xmark.circle.fill") {
self.text.removeAll()
self.localText.removeAll()
}
.foregroundStyle(Color.primary)
.opacity(0.2)
.labelStyle(.iconOnly)
.buttonStyle(.borderless)
.hoverEffect()
}
}
.onChange(of: self.isFocused) { isFocused in
if !isFocused {
self.text = self.localText
}
}
.onChange(of: self.text) { text in
self.localText = text
}
}
}
#Preview {
LazyTextField("Name", text: .constant(""))
}

40
DNSecure/Views/ProbeURLView.swift
View file

@ -1,40 +0,0 @@
import NetworkExtension
import SwiftUI
struct ProbeURLView {
@Binding var rule: OnDemandRule
private var probeURL: Binding<String> {
.init(
get: { self.rule.probeURL?.absoluteString ?? "" },
set: { self.rule.probeURL = URL(string: $0) }
)
}
}
extension ProbeURLView: View {
var body: some View {
Form {
Section {
LazyTextField("Probe URL", text: self.probeURL)
.textContentType(.URL)
.keyboardType(.URL)
.textInputAutocapitalization(.never)
.autocorrectionDisabled()
} footer: {
Text(
"If a request sent to this URL results in a HTTP 200 OK response and all of the other conditions in the rule match, then the rule matches. If you don't want to use this rule, leave it empty."
)
}
}
.navigationTitle("Probe URL")
}
}
@available(iOS 17, *)
#Preview {
@Previewable @State var rule = OnDemandRule(name: "Preview Rule")
NavigationStack {
ProbeURLView(rule: $rule)
}
}

71
DNSecure/Views/RestorationView.swift
View file

@ -1,71 +0,0 @@
//
// RestorationView.swift
// DNSecure
//
// Created by Kenta Kubo on 7/17/24.
//
import SwiftUI
struct RestorationView {
@Environment(\.dismiss) private var dismiss
@State private var added = Set<Resolver>()
@State private var keyword = ""
let onAdd: (Resolver) -> Void
private var servers: Resolvers {
guard !self.keyword.isEmpty else { return Presets.servers }
return Presets.servers.filter { $0.name.localizedCaseInsensitiveContains(self.keyword) }
}
}
extension RestorationView: View {
var body: some View {
NavigationView {
List(self.servers, id: \.self) { resolver in
HStack {
VStack(alignment: .leading) {
Text(resolver.name)
Text(resolver.configuration.description)
.foregroundStyle(.secondary)
}
Spacer()
if self.added.contains(resolver) {
HStack(spacing: 5) {
Image(systemName: "checkmark")
Text("Added")
}
.foregroundStyle(.secondary)
} else {
Button {
self.added.insert(resolver)
self.onAdd(resolver)
} label: {
HStack(spacing: 5) {
Image(systemName: "plus")
Text("Add")
}
}
.buttonStyle(.borderedProminent)
.buttonBorderShape(.capsule)
.hoverEffect()
}
}
}
.navigationTitle("Presets")
.toolbar {
ToolbarItem(placement: .cancellationAction) {
Button("Cancel", systemImage: "xmark", role: .cancel) {
self.dismiss()
}
}
}
}
.navigationViewStyle(.stack)
.searchable(text: self.$keyword, placement: .navigationBarDrawer(displayMode: .always))
}
}
#Preview {
RestorationView { _ in }
}

285
DNSecure/Views/RuleView.swift
View file

@ -12,201 +12,140 @@ struct RuleView {
@Binding var rule: OnDemandRule
}
@MainActor
extension RuleView: View {
var body: some View {
Form {
Section("Name") {
LazyTextField("Name", text: self.$rule.name)
}
Section("Matching Conditions") {
NavigationLink {
InterfaceTypeMatchView(rule: self.$rule)
} label: {
self.interfaceTypeMatchLabel
Section {
HStack {
Text("Name")
TextField("Name", text: self.$rule.name)
.multilineTextAlignment(.trailing)
}
if self.rule.interfaceType.isSSIDUsed {
NavigationLink {
SSIDMatchView(rule: self.$rule)
} label: {
self.ssidMatchLabel
Picker("Action", selection: self.$rule.action) {
ForEach(NEOnDemandRuleAction.allCases, id: \.self) {
Text($0.description)
}
}
NavigationLink {
DNSSearchDomainMatchView(rule: self.$rule)
} label: {
self.dnsSearchDomainMatchLabel
}
NavigationLink {
DNSServerAddressMatchView(rule: self.$rule)
} label: {
self.dnsServerAddressMatchLabel
}
NavigationLink {
ProbeURLView(rule: self.$rule)
} label: {
self.probeURLLabel
}
}
Section {
Picker("Action", selection: self.$rule.action) {
ForEach(
[
NEOnDemandRuleAction.connect,
.evaluateConnection,
.disconnect,
],
id: \.self
) {
Picker("Interface Type", selection: self.$rule.interfaceType) {
ForEach(NEOnDemandRuleInterfaceType.allCases, id: \.self) {
Text($0.description)
}
}
if self.rule.action == .evaluateConnection {
NavigationLink {
ExcludedDomainsView(
domains: .init(
get: { self.rule.excludedDomains ?? [] },
set: { self.rule.excludedDomains = $0 }
} header: {
Text("Interface Type Match")
} footer: {
Text("If the current primary network interface is of this type and all of the other conditions in the rule match, then the rule matches.")
}
if self.rule.interfaceType.ssidIsUsed {
Section {
ForEach(0..<self.rule.ssidMatch.count, id: \.self) { i in
TextField(
"SSID",
// self.$rule.ssidMatch[i] causes crash on deletion
text: .init(
get: { self.rule.ssidMatch[i] },
set: { self.rule.ssidMatch[i] = $0 }
)
)
} label: {
HStack {
Text("Excluded Domains")
Spacer()
Text("\(self.rule.excludedDomains?.count ?? 0)")
.foregroundStyle(.secondary)
}
.onDelete { self.rule.ssidMatch.remove(atOffsets: $0) }
.onMove { self.rule.ssidMatch.move(fromOffsets: $0, toOffset: $1) }
Button("Add SSID") {
NEHotspotNetwork.fetchCurrent { network in
self.rule.ssidMatch.append(network?.ssid ?? "")
}
}
} header: {
EditButton()
.frame(maxWidth: .infinity, alignment: .trailing)
.overlay(alignment: .leading) {
Text("SSID Match")
}
} footer: {
Text("If the Service Set Identifier (SSID) of the current primary connected network matches one of the strings in this array and all of the other conditions in the rule match, then the rule matches.")
}
}
Section {
ForEach(0..<self.rule.dnsSearchDomainMatch.count, id: \.self) { i in
TextField(
"Search Domain",
// self.$rule.dnsSearchDomainMatch[i] causes crash on deletion
text: .init(
get: { self.rule.dnsSearchDomainMatch[i] },
set: { self.rule.dnsSearchDomainMatch[i] = $0 }
)
)
}
.onDelete { self.rule.dnsSearchDomainMatch.remove(atOffsets: $0) }
.onMove { self.rule.dnsSearchDomainMatch.move(fromOffsets: $0, toOffset: $1) }
Button("Add DNS Search Domain") {
self.rule.dnsSearchDomainMatch.append("")
}
} header: {
EditButton()
.frame(maxWidth: .infinity, alignment: .trailing)
.overlay(alignment: .leading) {
Text("DNS Search Domain Match")
}
} footer: {
Text("If the current default search domain is equal to one of the strings in this array and all of the other conditions in the rule match, then the rule matches.")
}
Section {
ForEach(0..<self.rule.dnsServerAddressMatch.count, id: \.self) { i in
TextField(
"IP Address",
// self.$rule.dnsServerAddressMatch[i] causes crash on deletion
text: .init(
get: { self.rule.dnsServerAddressMatch[i] },
set: { self.rule.dnsServerAddressMatch[i] = $0 }
)
)
}
.onDelete { self.rule.dnsServerAddressMatch.remove(atOffsets: $0) }
.onMove { self.rule.dnsServerAddressMatch.move(fromOffsets: $0, toOffset: $1) }
Button("Add DNS Server Address") {
self.rule.dnsServerAddressMatch.append("")
}
} header: {
EditButton()
.frame(maxWidth: .infinity, alignment: .trailing)
.overlay(alignment: .leading) {
Text("DNS Server Address Match")
}
} footer: {
Text("If each of the current default DNS servers is equal to one of the strings in this array and all of the other conditions in the rule match, then the rule matches.")
}
Section {
HStack {
Text("Probe URL")
TextField(
"URL",
text: .init(
get: { self.rule.probeURL?.absoluteString ?? "" },
set: { self.rule.probeURL = URL(string: $0) }
)
)
.multilineTextAlignment(.trailing)
}
} header: {
Text("Probe URL Match")
} footer: {
Text("If a request sent to this URL results in a HTTP 200 OK response and all of the other conditions in the rule match, then the rule matches. If you don't want to use this rule, leave it empty.")
}
}
.navigationTitle(self.rule.name)
}
@ViewBuilder private var interfaceTypeMatchLabel: some View {
if #available(iOS 16, *) {
LabeledContent("Interface Type Match", value: self.rule.interfaceType.description)
} else {
HStack {
Text("Interface Type Match")
Spacer()
Text(self.rule.interfaceType.description)
.foregroundStyle(.secondary)
}
}
}
@ViewBuilder private var ssidMatchLabel: some View {
if #available(iOS 16, *) {
LabeledContent("SSID Match") {
if !self.rule.ssidMatch.isEmpty {
Text("\(self.rule.ssidMatch.count)")
} else {
Text("Not Used")
}
}
} else {
HStack {
Text("SSID Match")
Spacer()
Group {
if !self.rule.ssidMatch.isEmpty {
Text("\(self.rule.ssidMatch.count)")
} else {
Text("Not Used")
}
}
.foregroundStyle(.secondary)
}
}
}
@ViewBuilder private var dnsSearchDomainMatchLabel: some View {
if #available(iOS 16, *) {
LabeledContent("DNS Search Domain Match") {
if !self.rule.dnsSearchDomainMatch.isEmpty {
Text("\(self.rule.dnsSearchDomainMatch.count)")
} else {
Text("Not Used")
}
}
} else {
HStack {
Text("DNS Search Domain Match")
Spacer()
Group {
if !self.rule.dnsSearchDomainMatch.isEmpty {
Text("\(self.rule.dnsSearchDomainMatch.count)")
} else {
Text("Not Used")
}
}
.foregroundStyle(.secondary)
}
}
}
@ViewBuilder private var dnsServerAddressMatchLabel: some View {
if #available(iOS 16, *) {
LabeledContent("DNS Server Address Match") {
if !self.rule.dnsServerAddressMatch.isEmpty {
Text("\(self.rule.dnsServerAddressMatch.count)")
} else {
Text("Not Used")
}
}
} else {
HStack {
Text("DNS Server Address Match")
Spacer()
Group {
if !self.rule.dnsServerAddressMatch.isEmpty {
Text("\(self.rule.dnsServerAddressMatch.count)")
} else {
Text("Not Used")
}
}
.foregroundStyle(.secondary)
}
}
}
@ViewBuilder private var probeURLLabel: some View {
if #available(iOS 16, *) {
LabeledContent("Probe URL") {
if let url = self.rule.probeURL?.absoluteString {
Text(url)
} else {
Text("Not Used")
}
}
} else {
HStack {
Text("Probe URL")
Spacer()
Group {
if let url = self.rule.probeURL?.absoluteString {
Text(url)
} else {
Text("Not Used")
}
}
.foregroundStyle(.secondary)
}
}
}
}
@available(iOS 17, *)
#Preview {
@Previewable @State var rule = OnDemandRule(name: "Preview Rule")
NavigationStack {
RuleView(rule: $rule)
struct RuleView_Previews: PreviewProvider {
static var previews: some View {
RuleView(rule: .constant(OnDemandRule(name: "Preview Rule")))
}
}

50
DNSecure/Views/SSIDMatchView.swift
View file

@ -1,50 +0,0 @@
import NetworkExtension
import SwiftUI
struct SSIDMatchView {
@Binding var rule: OnDemandRule
}
extension SSIDMatchView: View {
var body: some View {
Form {
Section {
ForEach(0..<self.rule.ssidMatch.count, id: \.self) { i in
LazyTextField(
"SSID",
// self.$rule.ssidMatch[i] causes crash on deletion
text: .init(
get: { self.rule.ssidMatch[i] },
set: { self.rule.ssidMatch[i] = $0 }
)
)
.textInputAutocapitalization(.never)
.autocorrectionDisabled()
}
.onDelete { self.rule.ssidMatch.remove(atOffsets: $0) }
.onMove { self.rule.ssidMatch.move(fromOffsets: $0, toOffset: $1) }
Button("Add SSID") {
NEHotspotNetwork.fetchCurrent { network in
self.rule.ssidMatch.append(network?.ssid ?? "")
}
}
} footer: {
Text(
"If the Service Set Identifier (SSID) of the current primary connected network matches one of the strings in this array and all of the other conditions in the rule match, then the rule matches."
)
}
}
.navigationTitle("SSID Match")
.toolbar {
EditButton()
}
}
}
@available(iOS 17, *)
#Preview {
@Previewable @State var rule = OnDemandRule(name: "Preview Rule")
NavigationStack {
SSIDMatchView(rule: $rule)
}
}

27
DNSecureTests/DNSecureTests.swift
View file

@ -5,6 +5,29 @@
// Created by Kenta Kubo on 7/1/20.
//
import Testing
import XCTest
@testable import DNSecure
class DNSecureTests: XCTestCase {
override func setUpWithError() throws {
// Put setup code here. This method is called before the invocation of each test method in the class.
}
override func tearDownWithError() throws {
// Put teardown code here. This method is called after the invocation of each test method in the class.
}
func testExample() throws {
// This is an example of a functional test case.
// Use XCTAssert and related functions to verify your tests produce the correct results.
}
func testPerformanceExample() throws {
// This is an example of a performance test case.
self.measure {
// Put the code you want to measure the time of here.
}
}
}

22
DNSecureTests/Info.plist Normal file
View file

@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key>
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleVersion</key>
<string>1</string>
</dict>
</plist>

14
DNSecureUITests/DNSecureUITests.swift
View file

@ -7,7 +7,8 @@
import XCTest
final class DNSecureUITests: XCTestCase {
class DNSecureUITests: XCTestCase {
override func setUpWithError() throws {
// Put setup code here. This method is called before the invocation of each test method in the class.
@ -21,20 +22,21 @@ final class DNSecureUITests: XCTestCase {
// Put teardown code here. This method is called after the invocation of each test method in the class.
}
@MainActor
func testExample() throws {
// UI tests must launch the application that they test.
let app = XCUIApplication()
app.launch()
// Use recording to get started writing UI tests.
// Use XCTAssert and related functions to verify your tests produce the correct results.
}
@MainActor
func testLaunchPerformance() throws {
// This measures how long it takes to launch your application.
measure(metrics: [XCTApplicationLaunchMetric()]) {
XCUIApplication().launch()
if #available(macOS 10.15, iOS 13.0, tvOS 13.0, *) {
// This measures how long it takes to launch your application.
measure(metrics: [XCTApplicationLaunchMetric()]) {
XCUIApplication().launch()
}
}
}
}

32
DNSecureUITests/DNSecureUITestsLaunchTests.swift
View file

@ -1,32 +0,0 @@
//
// DNSecureUITestsLaunchTests.swift
// DNSecureUITests
//
// Created by Kenta Kubo on 9/3/25.
//
import XCTest
final class DNSecureUITestsLaunchTests: XCTestCase {
override class var runsForEachTargetApplicationUIConfiguration: Bool {
true
}
override func setUpWithError() throws {
continueAfterFailure = false
}
@MainActor
func testLaunch() throws {
let app = XCUIApplication()
app.launch()
// Insert steps here to perform after app launch but before taking a screenshot,
// such as logging into a test account or navigating somewhere in the app
let attachment = XCTAttachment(screenshot: app.screenshot())
attachment.name = "Launch Screen"
attachment.lifetime = .keepAlways
add(attachment)
}
}

22
DNSecureUITests/Info.plist Normal file
View file

@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key>
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleVersion</key>
<string>1</string>
</dict>
</plist>

2
LICENSE.txt → LICENSE
View file

@ -1,6 +1,6 @@
MIT License
Copyright (c) 2020-2026 Kenta Kubo
Copyright (c) 2020 Kenta Kubo
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal

51
Package.swift
View file

@ -1,51 +0,0 @@
// swift-tools-version: 6.0
// WARNING:
// This file is automatically generated.
// Do not edit it by hand because the contents will be replaced.
import AppleProductTypes
import PackageDescription
let package = Package(
name: "DNSecure",
platforms: [
.iOS("16.1")
],
products: [
.iOSApplication(
name: "DNSecure",
targets: ["DNSecure"],
bundleIdentifier: "xyz.kebo.DNSecure",
teamIdentifier: "X4678G5DL2",
displayVersion: "1.6.2",
bundleVersion: "1",
appIcon: .asset("AppIcon-legacy"),
accentColor: .asset("AccentColor"),
supportedDeviceFamilies: [
.pad,
.phone,
],
supportedInterfaceOrientations: [
.portrait,
.landscapeRight,
.landscapeLeft,
.portraitUpsideDown(.when(deviceFamilies: [.pad])),
],
appCategory: .utilities
)
],
targets: [
.executableTarget(
name: "DNSecure",
path: "DNSecure"
),
.testTarget(
name: "DNSecureTests",
dependencies: [
.target(name: "DNSecure")
],
path: "DNSecureTests"
),
]
)

18
README.md
View file

@ -4,11 +4,15 @@ iOS 14+, iPadOS 14+, and macOS 11+ have supported encrypted DNS (e.g. DNS-over-T
This app uses the new [DNS Settings API](https://developer.apple.com/documentation/networkextension/dns_settings), so it requires iOS 14+, iPadOS 14+, or macOS 11+.
## Installation (iOS/iPadOS/macOS)
## Installation (iOS/iPadOS)
<a href="https://apps.apple.com/us/app/dnsecure/id1533413232?itscg=30200&itsct=apps_box_badge&mttnsubad=1533413232" style="display: inline-block;"><img src="https://toolbox.marketingtools.apple.com/api/v2/badges/download-on-the-app-store/black/en-us?releaseDate=1601251200" alt="Download on the App Store" style="width: 245px; height: 82px; vertical-align: middle; object-fit: contain;" /></a>
<a href="https://apps.apple.com/us/app/dnsecure/id1533413232?itsct=apps_box&amp;itscg=30200" style="display: inline-block; overflow: hidden; border-top-left-radius: 13px; border-top-right-radius: 13px; border-bottom-right-radius: 13px; border-bottom-left-radius: 13px; width: 250px; height: 83px;"><img src="https://tools.applemediaservices.com/api/badges/download-on-the-app-store/black/en-US?size=250x83&amp;releaseDate=1601251200&h=77f35e8e1cad98287ffaa894b10bb6e2" alt="Download on the App Store" style="border-top-left-radius: 13px; border-top-right-radius: 13px; border-bottom-right-radius: 13px; border-bottom-left-radius: 13px; width: 250px; height: 83px;"></a>
or [TestFlight Beta](https://testflight.apple.com/join/A8GwCnq8)
## Installation (macOS)
<a href="https://apps.apple.com/us/app/dnsecure/id1533413232?itsct=apps_box&amp;itscg=30200" style="display: inline-block; overflow: hidden; border-top-left-radius: 13px; border-top-right-radius: 13px; border-bottom-right-radius: 13px; border-bottom-left-radius: 13px; width: 250px; height: 83px;"><img src="https://tools.applemediaservices.com/api/badges/download-on-the-mac-app-store/black/en-US?size=250x83&amp;releaseDate=1601251200&h=fccb9f75527e66852c3734e23031dc45" alt="Download on the Mac App Store" style="border-top-left-radius: 13px; border-top-right-radius: 13px; border-bottom-right-radius: 13px; border-bottom-left-radius: 13px; width: 250px; height: 83px;"></a>
## How to use (iOS/iPadOS)
1. Select a DNS server you like, or add another one
@ -17,15 +21,7 @@ or [TestFlight Beta](https://testflight.apple.com/join/A8GwCnq8)
1. Go to "General" > "VPN & Network" > "DNS"
1. "Automatic" is selected by default, so select "DNSecure"
## How to use (macOS 13+)
1. Select a DNS server you like, or add another one
1. Enable "Use This Server"
1. Open the System Settings
1. Go to Network settings and click "Filters"
1. Enable "DNSecure"
## How to use (macOS 12)
## How to use (macOS)
1. Select a DNS server you like, or add another one
1. Enable "Use This Server"