Skip to content

Commit 002c47f

Browse files
isamneziaisamnezia
committed
AmneziaWG 1.0.0 (0)
1 parent 0829e99 commit 002c47f

File tree

14 files changed

+149
-1458
lines changed

14 files changed

+149
-1458
lines changed

‎.gitignore

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,5 @@ fastlane/test_output
4444
Preview.html
4545
output
4646

47-
# Wireguard specific
48-
Sources/WireGuardApp/Config/Developer.xcconfig
49-
5047
# Vim
5148
.*.sw*

‎Sources/Shared/Model/TunnelConfiguration+WgQuickConfig.swift

Lines changed: 55 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -130,32 +130,33 @@ extension TunnelConfiguration {
130130
if let listenPort = interface.listenPort {
131131
output.append("ListenPort = \(listenPort)\n")
132132
}
133-
if let Jc = interface.Jc {
134-
output.append("Jc = \(Jc)\n")
133+
134+
if let junkPacketCount = interface.junkPacketCount {
135+
output.append("Jc = \(junkPacketCount)\n")
135136
}
136-
if let Jmin = interface.Jmin {
137-
output.append("Jmin = \(Jmin)\n")
137+
if let junkPacketMinSize = interface.junkPacketMinSize {
138+
output.append("Jmin = \(junkPacketMinSize)\n")
138139
}
139-
if let Jmax = interface.Jmax {
140-
output.append("Jmax = \(Jmax)\n")
140+
if let junkPacketMaxSize = interface.junkPacketMaxSize {
141+
output.append("Jmax = \(junkPacketMaxSize)\n")
141142
}
142-
if let S1 = interface.S1 {
143-
output.append("S1 = \(S1)\n")
143+
if let initPacketJunkSize = interface.initPacketJunkSize {
144+
output.append("S1 = \(initPacketJunkSize)\n")
144145
}
145-
if let S2 = interface.S2 {
146-
output.append("S2 = \(S2)\n")
146+
if let responsePacketJunkSize = interface.responsePacketJunkSize {
147+
output.append("S2 = \(responsePacketJunkSize)\n")
147148
}
148-
if let H1 = interface.H1 {
149-
output.append("H1 = \(H1)\n")
149+
if let initPacketMagicHeader = interface.initPacketMagicHeader {
150+
output.append("H1 = \(initPacketMagicHeader)\n")
150151
}
151-
if let H2 = interface.H2 {
152-
output.append("H2 = \(H2)\n")
152+
if let responsePacketMagicHeader = interface.responsePacketMagicHeader {
153+
output.append("H2 = \(responsePacketMagicHeader)\n")
153154
}
154-
if let H3 = interface.H3 {
155-
output.append("H3 = \(H3)\n")
155+
if let underloadPacketMagicHeader = interface.underloadPacketMagicHeader {
156+
output.append("H3 = \(underloadPacketMagicHeader)\n")
156157
}
157-
if let H4 = interface.H4 {
158-
output.append("H4 = \(H4)\n")
158+
if let transportPacketMagicHeader = interface.transportPacketMagicHeader {
159+
output.append("H4 = \(transportPacketMagicHeader)\n")
159160
}
160161
if !interface.addresses.isEmpty {
161162
let addressString = interface.addresses.map { $0.stringRepresentation }.joined(separator: ", ")
@@ -235,59 +236,59 @@ extension TunnelConfiguration {
235236
}
236237
interface.mtu = mtu
237238
}
238-
if let JcString = attributes["jc"] {
239-
guard let jc = UInt16(JcString) else {
240-
throw ParseError.interfaceHasInvalidCustomParam(JcString)
239+
if let junkPacketCountString = attributes["jc"] {
240+
guard let junkPacketCount = UInt16(junkPacketCountString) else {
241+
throw ParseError.interfaceHasInvalidCustomParam(junkPacketCountString)
241242
}
242-
interface.Jc = jc
243+
interface.junkPacketCount = junkPacketCount
243244
}
244-
if let JminString = attributes["jmin"] {
245-
guard let jmin = UInt16(JminString) else {
246-
throw ParseError.interfaceHasInvalidCustomParam(JminString)
245+
if let junkPacketMinSizeString = attributes["jmin"] {
246+
guard let junkPacketMinSize = UInt16(junkPacketMinSizeString) else {
247+
throw ParseError.interfaceHasInvalidCustomParam(junkPacketMinSizeString)
247248
}
248-
interface.Jmin = jmin
249+
interface.junkPacketMinSize = junkPacketMinSize
249250
}
250-
if let JmaxString = attributes["jmax"] {
251-
guard let jmax = UInt16(JmaxString) else {
252-
throw ParseError.interfaceHasInvalidCustomParam(JmaxString)
251+
if let junkPacketMaxSizeString = attributes["jmax"] {
252+
guard let junkPacketMaxSize = UInt16(junkPacketMaxSizeString) else {
253+
throw ParseError.interfaceHasInvalidCustomParam(junkPacketMaxSizeString)
253254
}
254-
interface.Jmax = jmax
255+
interface.junkPacketMaxSize = junkPacketMaxSize
255256
}
256-
if let S1String = attributes["s1"] {
257-
guard let s1 = UInt16(S1String) else {
258-
throw ParseError.interfaceHasInvalidCustomParam(S1String)
257+
if let initPacketJunkSizeString = attributes["s1"] {
258+
guard let initPacketJunkSize = UInt16(initPacketJunkSizeString) else {
259+
throw ParseError.interfaceHasInvalidCustomParam(initPacketJunkSizeString)
259260
}
260-
interface.S1 = s1
261+
interface.initPacketJunkSize = initPacketJunkSize
261262
}
262-
if let S2String = attributes["s2"] {
263-
guard let s2 = UInt16(S2String) else {
264-
throw ParseError.interfaceHasInvalidCustomParam(S2String)
263+
if let responsePacketJunkSizeString = attributes["s2"] {
264+
guard let responsePacketJunkSize = UInt16(responsePacketJunkSizeString) else {
265+
throw ParseError.interfaceHasInvalidCustomParam(responsePacketJunkSizeString)
265266
}
266-
interface.S2 = s2
267+
interface.responsePacketJunkSize = responsePacketJunkSize
267268
}
268-
if let H1String = attributes["h1"] {
269-
guard let h1 = UInt32(H1String) else {
270-
throw ParseError.interfaceHasInvalidCustomParam(H1String)
269+
if let initPacketMagicHeaderString = attributes["h1"] {
270+
guard let initPacketMagicHeader = UInt32(initPacketMagicHeaderString) else {
271+
throw ParseError.interfaceHasInvalidCustomParam(initPacketMagicHeaderString)
271272
}
272-
interface.H1 = h1
273+
interface.initPacketMagicHeader = initPacketMagicHeader
273274
}
274-
if let H2String = attributes["h2"] {
275-
guard let h2 = UInt32(H2String) else {
276-
throw ParseError.interfaceHasInvalidCustomParam(H2String)
275+
if let responsePacketMagicHeaderString = attributes["h2"] {
276+
guard let responsePacketMagicHeader = UInt32(responsePacketMagicHeaderString) else {
277+
throw ParseError.interfaceHasInvalidCustomParam(responsePacketMagicHeaderString)
277278
}
278-
interface.H2 = h2
279+
interface.responsePacketMagicHeader = responsePacketMagicHeader
279280
}
280-
if let H3String = attributes["h3"] {
281-
guard let h3 = UInt32(H3String) else {
282-
throw ParseError.interfaceHasInvalidCustomParam(H3String)
281+
if let underloadPacketMagicHeaderString = attributes["h3"] {
282+
guard let underloadPacketMagicHeader = UInt32(underloadPacketMagicHeaderString) else {
283+
throw ParseError.interfaceHasInvalidCustomParam(underloadPacketMagicHeaderString)
283284
}
284-
interface.H3 = h3
285+
interface.underloadPacketMagicHeader = underloadPacketMagicHeader
285286
}
286-
if let H4String = attributes["h4"] {
287-
guard let h4 = UInt32(H4String) else {
288-
throw ParseError.interfaceHasInvalidCustomParam(H4String)
287+
if let transportPacketMagicHeaderString = attributes["h4"] {
288+
guard let transportPacketMagicHeader = UInt32(transportPacketMagicHeaderString) else {
289+
throw ParseError.interfaceHasInvalidCustomParam(transportPacketMagicHeaderString)
289290
}
290-
interface.H4 = h4
291+
interface.transportPacketMagicHeader = transportPacketMagicHeader
291292
}
292293
return interface
293294
}

‎Sources/WireGuardApp/Base.lproj/Localizable.strings

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -402,6 +402,8 @@
402402

403403
"macAlertMultipleEntriesForKey (%@)" = "There should be only one entry per section for key ‘%@’";
404404

405+
"macAlertInterfaceHasInvalidCustomParam (%@)" = "Interface has invalid custom param ‘%@’";
406+
405407
// Mac about dialog
406408

407409
"macAppVersion (%@)" = "App version: %@";

‎Sources/WireGuardApp/Config/Developer.xcconfig

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
// Developer.xcconfig
2+
3+
// You Apple developer account's Team ID
4+
DEVELOPMENT_TEAM = X7UJ388FXK
5+
6+
// The bundle identifier of the apps.
7+
// Should be an app id created at developer.apple.com
8+
// with Network Extensions capabilty.
9+
APP_ID_IOS = org.amnezia.awg
10+
APP_ID_MACOS = org.amnezia.awg

‎Sources/WireGuardApp/Config/Version.xcconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
VERSION_NAME = 1.0.16
2-
VERSION_ID = 27
1+
VERSION_NAME = 1.0.0
2+
VERSION_ID = 0

‎Sources/WireGuardApp/UI/iOS/ViewController/SettingsTableViewController.swift

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,9 +149,10 @@ extension SettingsTableViewController {
149149
appVersion += " (\(appBuild))"
150150
}
151151
cell.value = appVersion
152-
} else if field == .goBackendVersion {
153-
cell.value = WIREGUARD_GO_VERSION
154152
}
153+
// else if field == .goBackendVersion {
154+
// cell.value = WIREGUARD_GO_VERSION
155+
// }
155156
return cell
156157
} else if field == .exportZipArchive {
157158
let cell: ButtonCell = tableView.dequeueReusableCell(for: indexPath)

‎Sources/WireGuardApp/UI/macOS/AppDelegate.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ extension AppDelegate {
195195
}
196196
let appVersionString = [
197197
tr(format: "macAppVersion (%@)", appVersion),
198-
tr(format: "macGoBackendVersion (%@)", WIREGUARD_GO_VERSION)
198+
// tr(format: "macGoBackendVersion (%@)", WIREGUARD_GO_VERSION)
199199
].joined(separator: "\n")
200200
NSApp.activate(ignoringOtherApps: true)
201201
NSApp.orderFrontStandardAboutPanel(options: [

‎Sources/WireGuardApp/UI/macOS/ParseError+WireGuardAppError.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ extension TunnelConfiguration.ParseError: WireGuardAppError {
5151
return (tr("alertInvalidPeerMessagePublicKeyDuplicated"), "")
5252
case .multipleEntriesForKey(let value):
5353
return (tr(format: "macAlertMultipleEntriesForKey (%@)", value), "")
54+
case .interfaceHasInvalidCustomParam(let customParam):
55+
return (tr(format: "macAlertInterfaceHasInvalidCustomParam (%@)", customParam), "")
5456
}
5557
}
5658
}

‎Sources/WireGuardKit/InterfaceConfiguration.swift

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ import Network
77
public struct InterfaceConfiguration {
88
public var privateKey: PrivateKey
99
public var addresses = [IPAddressRange]()
10-
public var Jc: UInt16?
11-
public var Jmin: UInt16?
12-
public var Jmax: UInt16?
13-
public var S1: UInt16?
14-
public var S2: UInt16?
15-
public var H1: UInt32?
16-
public var H2: UInt32?
17-
public var H3: UInt32?
18-
public var H4: UInt32?
10+
public var junkPacketCount: UInt16?
11+
public var junkPacketMinSize: UInt16?
12+
public var junkPacketMaxSize: UInt16?
13+
public var initPacketJunkSize: UInt16?
14+
public var responsePacketJunkSize: UInt16?
15+
public var initPacketMagicHeader: UInt32?
16+
public var responsePacketMagicHeader: UInt32?
17+
public var underloadPacketMagicHeader: UInt32?
18+
public var transportPacketMagicHeader: UInt32?
1919
public var listenPort: UInt16?
2020
public var mtu: UInt16?
2121
public var dns = [DNSServer]()

‎Sources/WireGuardKit/PacketTunnelSettingsGenerator.swift

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -47,32 +47,33 @@ class PacketTunnelSettingsGenerator {
4747
if let listenPort = tunnelConfiguration.interface.listenPort {
4848
wgSettings.append("listen_port=\(listenPort)\n")
4949
}
50-
if let Jc = tunnelConfiguration.interface.Jc {
51-
wgSettings.append("jc=\(Jc)\n")
50+
51+
if let junkPacketCount = tunnelConfiguration.interface.junkPacketCount {
52+
wgSettings.append("jc=\(junkPacketCount)\n")
5253
}
53-
if let Jmin = tunnelConfiguration.interface.Jmin {
54-
wgSettings.append("jmin=\(Jmin)\n")
54+
if let junkPacketMinSize = tunnelConfiguration.interface.junkPacketMinSize {
55+
wgSettings.append("jmin=\(junkPacketMinSize)\n")
5556
}
56-
if let Jmax = tunnelConfiguration.interface.Jmax {
57-
wgSettings.append("jmax=\(Jmax)\n")
57+
if let junkPacketMaxSize = tunnelConfiguration.interface.junkPacketMaxSize {
58+
wgSettings.append("jmax=\(junkPacketMaxSize)\n")
5859
}
59-
if let S1 = tunnelConfiguration.interface.S1 {
60-
wgSettings.append("s1=\(S1)\n")
60+
if let initPacketJunkSize = tunnelConfiguration.interface.initPacketJunkSize {
61+
wgSettings.append("s1=\(initPacketJunkSize)\n")
6162
}
62-
if let S2 = tunnelConfiguration.interface.S2 {
63-
wgSettings.append("s2=\(S2)\n")
63+
if let responsePacketJunkSize = tunnelConfiguration.interface.responsePacketJunkSize {
64+
wgSettings.append("s2=\(responsePacketJunkSize)\n")
6465
}
65-
if let H1 = tunnelConfiguration.interface.H1 {
66-
wgSettings.append("h1=\(H1)\n")
66+
if let initPacketMagicHeader = tunnelConfiguration.interface.initPacketMagicHeader {
67+
wgSettings.append("h1=\(initPacketMagicHeader)\n")
6768
}
68-
if let H2 = tunnelConfiguration.interface.H2 {
69-
wgSettings.append("h2=\(H2)\n")
69+
if let responsePacketMagicHeader = tunnelConfiguration.interface.responsePacketMagicHeader {
70+
wgSettings.append("h2=\(responsePacketMagicHeader)\n")
7071
}
71-
if let H3 = tunnelConfiguration.interface.H3 {
72-
wgSettings.append("h3=\(H3)\n")
72+
if let underloadPacketMagicHeader = tunnelConfiguration.interface.underloadPacketMagicHeader {
73+
wgSettings.append("h3=\(underloadPacketMagicHeader)\n")
7374
}
74-
if let H4 = tunnelConfiguration.interface.H4 {
75-
wgSettings.append("h4=\(H4)\n")
75+
if let transportPacketMagicHeader = tunnelConfiguration.interface.transportPacketMagicHeader {
76+
wgSettings.append("h4=\(transportPacketMagicHeader)\n")
7677
}
7778
if !tunnelConfiguration.peers.isEmpty {
7879
wgSettings.append("replace_peers=true\n")
@@ -143,7 +144,7 @@ class PacketTunnelSettingsGenerator {
143144
let (ipv4Addresses, ipv6Addresses) = addresses()
144145
let (ipv4IncludedRoutes, ipv6IncludedRoutes) = includedRoutes()
145146
let (ipv4ExcludedRoutes, ipv6ExcludedRoutes) = excludedRoutes()
146-
147+
147148
let ipv4Settings = NEIPv4Settings(addresses: ipv4Addresses.map { $0.destinationAddress }, subnetMasks: ipv4Addresses.map { $0.destinationSubnetMask })
148149
ipv4Settings.includedRoutes = ipv4IncludedRoutes
149150
ipv4Settings.excludedRoutes = ipv4ExcludedRoutes
@@ -202,7 +203,7 @@ class PacketTunnelSettingsGenerator {
202203
}
203204
return (ipv4IncludedRoutes, ipv6IncludedRoutes)
204205
}
205-
206+
206207
private func excludedRoutes() -> ([NEIPv4Route], [NEIPv6Route]) {
207208
var ipv4ExcludedRoutes = [NEIPv4Route]()
208209
var ipv6ExcludedRoutes = [NEIPv6Route]()

0 commit comments

Comments
 (0)