370ff654e7
Change license to AGPL
This commit:
- Updates the `LICENSE` file
- Start every file with something like:
// Copyright YEAR_FIRST_PUBLISHED Signal Messenger, LLC
// SPDX-License-Identifier: AGPL-3.0-only
---
First, I removed existing license headers with this Ruby 3.1.2 script:
require 'set'
EXTENSIONS_TO_CHECK = Set['.h', '.hpp', '.cpp', '.m', '.mm', '.pch', '.swift']
same = 0
different = 0
all_files = `git ls-files`.lines.map { |line| line.strip }
all_files.each do |relative_path|
if relative_path == 'Pods'
next
end
unless EXTENSIONS_TO_CHECK.include? File.extname(relative_path)
next
end
path = File.expand_path(relative_path)
contents = File.read(path)
new_contents = contents.sub(/\/\/\n\/\/ Copyright .*\n\/\/\n\n/, '')
if contents == new_contents
same += 1
else
different += 1
end
File.write(path, new_contents)
end
puts "updated #{different} file(s), left #{same} untouched"
I'm sure this script could be improved, but it worked well enough.
Then, I created `Scripts/lint/lint-license-headers` and ran it to auto-
fix a lot of files. This changed the mode of some files, but I think
that's actually desirable. For example,
`SignalServiceKit/src/Util/AppContext.m` previously had a mode of
`0755/-rwxr-xr-x`, and it's now `0644/-rw-r--r--`.
Then I fixed some stragglers and updated the precommit script.
See [a similar change in the Desktop app][0].
[0]: 8bfaf598af
96 lines
4.1 KiB
Swift
96 lines
4.1 KiB
Swift
//
|
|
// Copyright 2022 Signal Messenger, LLC
|
|
// SPDX-License-Identifier: AGPL-3.0-only
|
|
//
|
|
|
|
import XCTest
|
|
import SignalServiceKit
|
|
|
|
class OWSRequestFactoryTest: SSKBaseTestSwift {
|
|
private func getUdAccessKey() throws -> SMKUDAccessKey {
|
|
let profileKey = Data(count: Int(kAES256_KeyByteLength))
|
|
let result = try? SMKUDAccessKey(profileKey: profileKey)
|
|
return try XCTUnwrap(result)
|
|
}
|
|
|
|
private func queryItemsAsDictionary(url: URL) throws -> [String: String] {
|
|
let urlComponents = try XCTUnwrap(URLComponents(url: url, resolvingAgainstBaseURL: false), "URL components")
|
|
let queryItems = urlComponents.queryItems ?? []
|
|
var result = [String: String]()
|
|
for queryItem in queryItems {
|
|
XCTAssertNil(result[queryItem.name], "Duplicate query item \(queryItem.name)")
|
|
result[queryItem.name] = queryItem.value
|
|
}
|
|
return result
|
|
}
|
|
|
|
func testSubmitMessageRequest() throws {
|
|
let udAccessKey = try getUdAccessKey()
|
|
|
|
let recipientUuid = UUID()
|
|
|
|
let request = OWSRequestFactory.submitMessageRequest(
|
|
with: SignalServiceAddress(uuid: recipientUuid),
|
|
messages: [],
|
|
timestamp: 1234,
|
|
udAccessKey: udAccessKey,
|
|
isOnline: true,
|
|
isUrgent: false,
|
|
isStory: false
|
|
)
|
|
|
|
let url = try XCTUnwrap(request.url, "request.url")
|
|
XCTAssertEqual(request.httpMethod, "PUT")
|
|
XCTAssertEqual(url.path, "v1/messages/\(recipientUuid.uuidString)")
|
|
XCTAssertEqual(Set(request.parameters.keys), Set(["messages", "timestamp", "online", "urgent"]))
|
|
XCTAssertEqual(request.parameters["messages"] as? NSArray, [])
|
|
XCTAssertEqual(request.parameters["timestamp"] as? UInt, 1234)
|
|
XCTAssertEqual(request.parameters["online"] as? Bool, true)
|
|
XCTAssertEqual(request.parameters["urgent"] as? Bool, false)
|
|
XCTAssertEqual(try queryItemsAsDictionary(url: url), ["story": "false"])
|
|
XCTAssertEqual(request.allHTTPHeaderFields?["Unidentified-Access-Key"], udAccessKey.keyData.base64EncodedString())
|
|
}
|
|
|
|
func testSubmitMultiRecipientMessageRequest() throws {
|
|
let ciphertext = try XCTUnwrap("hello".data(using: .utf8))
|
|
let udAccessKey = try getUdAccessKey()
|
|
|
|
let request = OWSRequestFactory.submitMultiRecipientMessageRequest(
|
|
ciphertext: ciphertext,
|
|
compositeUDAccessKey: udAccessKey,
|
|
timestamp: 1234,
|
|
isOnline: true,
|
|
isUrgent: false,
|
|
isStory: false
|
|
)
|
|
|
|
let url = try XCTUnwrap(request.url, "request.url")
|
|
XCTAssertEqual(request.httpMethod, "PUT")
|
|
XCTAssertEqual(url.path, "v1/messages/multi_recipient")
|
|
XCTAssertEqual(try queryItemsAsDictionary(url: url), ["ts": "1234", "online": "true", "urgent": "false", "story": "false"])
|
|
XCTAssertEqual(request.allHTTPHeaderFields?["Content-Type"], "application/vnd.signal-messenger.mrm")
|
|
XCTAssertEqual(request.allHTTPHeaderFields?["Unidentified-Access-Key"], udAccessKey.keyData.base64EncodedString())
|
|
XCTAssertEqual(request.httpBody, ciphertext)
|
|
}
|
|
|
|
func testBoostCreatePaymentIntentWithAmount() {
|
|
let request = OWSRequestFactory.boostCreatePaymentIntent(withAmount: 123, inCurrencyCode: "CHF", level: 456)
|
|
|
|
XCTAssertEqual(request.url?.path, "v1/subscription/boost/create")
|
|
XCTAssertEqual(request.httpMethod, "POST")
|
|
XCTAssertEqual(Set(request.parameters.keys), Set(["currency", "amount", "level"]))
|
|
XCTAssertEqual(request.parameters["currency"] as? String, "chf")
|
|
XCTAssertEqual(request.parameters["amount"] as? UInt, 123)
|
|
XCTAssertEqual(request.parameters["level"] as? UInt64, 456)
|
|
XCTAssertFalse(request.shouldHaveAuthorizationHeaders)
|
|
}
|
|
|
|
func testGiftBadgePricesRequest() throws {
|
|
let request = OWSRequestFactory.giftBadgePricesRequest()
|
|
|
|
XCTAssertEqual(request.url?.path, "v1/subscription/boost/amounts/gift")
|
|
XCTAssertEqual(request.httpMethod, "GET")
|
|
XCTAssertTrue(request.parameters.isEmpty)
|
|
}
|
|
}
|