From ac85091209db310ab31b26430373aad673372bb4 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 21 Sep 2018 12:47:57 -0400 Subject: [PATCH] Initial code drop. --- .clang-format | 15 + .gitignore | 30 + CONTRIBUTING.md | 83 +++ LICENSE | 621 ++++++++++++++++++ README.md | 27 + SignalCoreKit.podspec | 46 ++ SignalCoreKit.xcodeproj/project.pbxproj | 458 +++++++++++++ .../contents.xcworkspacedata | 7 + .../xcshareddata/IDEWorkspaceChecks.plist | 8 + .../UserInterfaceState.xcuserstate | Bin 0 -> 16545 bytes .../xcschemes/xcschememanagement.plist | 14 + SignalCoreKit/Info.plist | 24 + SignalCoreKit/SCKPrefix.h | 16 + SignalCoreKit/SignalCoreKit.h | 19 + SignalCoreKit/src/Logger.swift | 77 +++ SignalCoreKit/src/NSData+OWS.h | 26 + SignalCoreKit/src/NSData+OWS.m | 95 +++ SignalCoreKit/src/NSObject+OWS.h | 19 + SignalCoreKit/src/NSObject+OWS.m | 37 ++ SignalCoreKit/src/NSString+SSK.h | 21 + SignalCoreKit/src/NSString+SSK.m | 372 +++++++++++ SignalCoreKit/src/OWSAsserts.h | 236 +++++++ SignalCoreKit/src/OWSAsserts.m | 9 + SignalCoreKit/src/OWSFileSystem.h | 50 ++ SignalCoreKit/src/OWSFileSystem.m | 334 ++++++++++ SignalCoreKit/src/OWSLogger.h | 80 +++ SignalCoreKit/src/OWSLogger.m | 43 ++ SignalCoreKit/src/OWSSwiftUtils.swift | 59 ++ SignalCoreKit/src/Threading.h | 17 + SignalCoreKit/src/Threading.m | 35 + SignalCoreKitTests/Info.plist | 22 + SignalCoreKitTests/SignalCoreKitTests.swift | 36 + 32 files changed, 2936 insertions(+) create mode 100644 .clang-format create mode 100644 .gitignore create mode 100644 CONTRIBUTING.md create mode 100644 LICENSE create mode 100644 README.md create mode 100644 SignalCoreKit.podspec create mode 100644 SignalCoreKit.xcodeproj/project.pbxproj create mode 100644 SignalCoreKit.xcodeproj/project.xcworkspace/contents.xcworkspacedata create mode 100644 SignalCoreKit.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 SignalCoreKit.xcodeproj/project.xcworkspace/xcuserdata/matthew.xcuserdatad/UserInterfaceState.xcuserstate create mode 100644 SignalCoreKit.xcodeproj/xcuserdata/matthew.xcuserdatad/xcschemes/xcschememanagement.plist create mode 100644 SignalCoreKit/Info.plist create mode 100644 SignalCoreKit/SCKPrefix.h create mode 100644 SignalCoreKit/SignalCoreKit.h create mode 100644 SignalCoreKit/src/Logger.swift create mode 100644 SignalCoreKit/src/NSData+OWS.h create mode 100644 SignalCoreKit/src/NSData+OWS.m create mode 100644 SignalCoreKit/src/NSObject+OWS.h create mode 100644 SignalCoreKit/src/NSObject+OWS.m create mode 100644 SignalCoreKit/src/NSString+SSK.h create mode 100644 SignalCoreKit/src/NSString+SSK.m create mode 100755 SignalCoreKit/src/OWSAsserts.h create mode 100755 SignalCoreKit/src/OWSAsserts.m create mode 100644 SignalCoreKit/src/OWSFileSystem.h create mode 100644 SignalCoreKit/src/OWSFileSystem.m create mode 100644 SignalCoreKit/src/OWSLogger.h create mode 100644 SignalCoreKit/src/OWSLogger.m create mode 100644 SignalCoreKit/src/OWSSwiftUtils.swift create mode 100644 SignalCoreKit/src/Threading.h create mode 100644 SignalCoreKit/src/Threading.m create mode 100644 SignalCoreKitTests/Info.plist create mode 100644 SignalCoreKitTests/SignalCoreKitTests.swift diff --git a/.clang-format b/.clang-format new file mode 100644 index 0000000..6d3ed1c --- /dev/null +++ b/.clang-format @@ -0,0 +1,15 @@ +--- +BasedOnStyle: WebKit +AllowShortFunctionsOnASingleLine: false +BinPackArguments: false +BinPackParameters: false +ColumnLimit: 120 +IndentCaseLabels: true +MaxEmptyLinesToKeep: 2 +ObjCSpaceAfterProperty: true +ObjCSpaceBeforeProtocolList: true +PointerBindsToType: false +SpacesBeforeTrailingComments: 1 +TabWidth: 8 +UseTab: Never +... diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..10b7a51 --- /dev/null +++ b/.gitignore @@ -0,0 +1,30 @@ +# Exclude the build directory +build/* +# Exclude temp nibs and swap files +*~.nib +*.swp + +# Exclude OS X folder attributes +.DS_Store + +# Exclude user-specific XCode 3 and 4 files +xcuserdata +*.xccheckout + +*.pbxuser +!default.pbxuser +*.mode1v3 +!default.mode1v3 +*.mode2v3 +!default.mode2v3 +*.perspectivev3 +!default.perspectivev3 +xcuserdata +*.xccheckout +*.moved-aside +DerivedData +*.hmap +*.ipa +*.xcuserstate +Index/ + diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 0000000..261ee88 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,83 @@ +# Contributing to Signal iOS + +Thank you for supporting Signal and looking for ways to help. Please note that some conventions here might be a bit different than what you are used to, even if you have contributed to other open source projects before. Reading this document will help you save time and work effectively with the developers and other contributors. + + +## Development Ideology + +Truths which we believe to be self-evident: + +1. **The answer is not more options.** If you feel compelled to add a preference that's exposed to the user, it's very possible you've made a wrong turn somewhere. +1. **The user doesn't know what a key is.** We need to minimize the points at which a user is exposed to this sort of terminology as extremely as possible. +1. **There are no power users.** The idea that some users "understand" concepts better than others has proven to be, for the most part, false. If anything, "power users" are more dangerous than the rest, and we should avoid exposing dangerous functionality to them. +1. **If it's "like PGP," it's wrong.** PGP is our guide for what not to do. +1. **It's an asynchronous world.** Be wary of anything that is anti-asynchronous: ACKs, protocol confirmations, or any protocol-level "advisory" message. +1. **There is no such thing as time.** Protocol ideas that require synchronized clocks are doomed to failure. + + +## Translations + +Thanks to a dedicated community of volunteer translators, Signal is now available in more than one hundred languages. We use Transifex to manage our translation efforts, not GitHub. Any suggestions, corrections, or new translations should be submitted to the [Signal localization project for iOS](https://www.transifex.com/signalapp/signal-ios/). + +## Issues + +Please search both open and closed issues to make sure your bug report is not a duplicate. + +### The issue tracker is for bugs, not feature requests +The GitHub issue tracker is not used for feature requests, but new ideas can be submitted and discussed on the [community forum](https://community.signalusers.org/c/feature-requests). The purpose of this issue tracker is to track bugs in the iOS client. Bug reports should only be submitted for existing functionality that does not work as intended. Comments that are relevant and concise will help the developers solve issues more quickly. + +### Send support questions to support +You can reach support by sending an email to support@signal.org or by visiting the [Signal Support Center](https://support.signal.org/) where you can also search for existing troubleshooting articles and find answers to frequently asked questions. Please do not post support questions on the GitHub issue tracker. + +### GitHub is not a generic discussion forum +Conversations about open bug reports belong here. However, all other discussions should take place on the [community forum](https://community.signalusers.org). You can use the community forum to discuss anything that is related to Signal or to hang out with your fellow users in the "Off Topic" category. + +### Don't bump issues +Every time someone comments on an issue, GitHub sends an email to [hundreds of people](https://github.com/signalapp/Signal-iOS/watchers). Bumping issues with a "+1" (or asking for updates) generates a lot of unnecessary email notifications and does not help anyone solve the issue any faster. Please be respectful of everyone's time and only comment when you have new information to add. + +### Open issues + +#### If it's open, it's tracked +The developers read every issue, but high-priority bugs or features can take precedence over others. Signal is an open source project, and everyone is encouraged to play an active role in diagnosing and fixing open issues. + +### Closed issues + +#### "My issue was closed without giving a reason!" +Although we do our best, writing detailed explanations for every issue can be time consuming, and the topic also might have been covered previously in other related issues. + + +## Pull requests + +### Smaller is better +Big changes are significantly less likely to be accepted. Large features often require protocol modifications and necessitate a staged rollout process that is coordinated across millions of users on multiple platforms (Android, iOS, and Desktop). + +Try not to take on too much at once. As a first-time contributor, we recommend starting with small and simple PRs in order to become familiar with the codebase. Most of the work should go into discovering which three lines need to change rather than writing the code. + +### Sign the Contributor License Agreement (CLA) +You will need to [sign our CLA](https://signal.org/cla/) before your pull request can be merged. + +### Submit finished and well-tested pull requests +Please do not submit pull requests that are still a work in progress. Pull requests should be thoroughly tested and ready to merge before they are submitted. + +### Merging can sometimes take a while +If your pull request follows all of the advice above but still has not been merged, this usually means that the developers haven't had time to review it yet. We understand that this might feel frustrating, and we apologize. The Signal team is still small, but [we are hiring](https://signal.org/workworkwork/). + + +## How can I contribute? +There are several other ways to get involved: +* Help new users learn about Signal. + * Redirect support questions to support@signal.org and the [Signal Support Center](https://support.signal.org/). + * Redirect non-bug discussions to the [community forum](https://community.signalusers.org). +* Improve documentation in the [wiki](https://github.com/signalapp/Signal-iOS/wiki). +* Join the community of volunteer translators on Transifex: + * [Android](https://www.transifex.com/projects/p/signal-android/) + * [iOS](https://www.transifex.com/signalapp/signal-ios/) + * [Desktop](https://www.transifex.com/signalapp/signal-desktop/) +* Find and mark duplicate issues. +* Try to reproduce issues and help with troubleshooting. +* Discover solutions to open issues and post any relevant findings. +* Test other people's pull requests. +* Contribute to Signal via the [Freedom of the Press Foundation's donation page](https://freedom.press/crowdfunding/signal/). +* Share Signal with your friends and family. + +Signal is made for you. Thank you for your feedback and support. diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..94a0453 --- /dev/null +++ b/LICENSE @@ -0,0 +1,621 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS diff --git a/README.md b/README.md new file mode 100644 index 0000000..592c703 --- /dev/null +++ b/README.md @@ -0,0 +1,27 @@ +# SignalCoreKit for iOS + +## Translation + +Help us translate Signal! The translation effort happens on [Transifex](https://www.transifex.com/signalapp/signal-ios/) + +## Contributing Code + +Instructions on how to set up your development environment and build Signal-iOS can be found in [BUILDING.md](https://github.com/signalapp/Signal-iOS/blob/master/BUILDING.md). Other useful instructions for development can be found on the [Development Guide wiki page](https://github.com/signalapp/Signal-iOS/wiki/Development-Guide). We also recommend reading the [contribution guidelines](https://github.com/signalapp/Signal-iOS/blob/master/CONTRIBUTING.md). + +## Contributing Ideas +Have something you want to say about Open Whisper Systems projects or want to be part of the conversation? Get involved in the [community forum](https://community.signalusers.org). + +## Cryptography Notice + +This distribution includes cryptographic software. The country in which you currently reside may have restrictions on the import, possession, use, and/or re-export to another country, of encryption software. +BEFORE using any encryption software, please check your country's laws, regulations and policies concerning the import, possession, or use, and re-export of encryption software, to see if this is permitted. +See for more information. + +The U.S. Government Department of Commerce, Bureau of Industry and Security (BIS), has classified this software as Export Commodity Control Number (ECCN) 5D002.C.1, which includes information security software using or performing cryptographic functions with asymmetric algorithms. +The form and manner of this distribution makes it eligible for export under the License Exception ENC Technology Software Unrestricted (TSU) exception (see the BIS Export Administration Regulations, Section 740.13) for both object code and source code. + +## License + +Copyright 2014-2018 Open Whisper Systems + +Licensed under the GPLv3: http://www.gnu.org/licenses/gpl-3.0.html diff --git a/SignalCoreKit.podspec b/SignalCoreKit.podspec new file mode 100644 index 0000000..1e690b4 --- /dev/null +++ b/SignalCoreKit.podspec @@ -0,0 +1,46 @@ +# +# Be sure to run `pod lib lint SignalCoreKit.podspec' to ensure this is a +# valid spec before submitting. +# +# Any lines starting with a # are optional, but their use is encouraged +# To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html +# + +Pod::Spec.new do |s| + s.name = "SignalCoreKit" + s.version = "1.0.0" + s.summary = "A Swift & Objective-C library used by other Signal libraries." + + s.description = <<-DESC +A Swift & Objective-C library used by other Signal libraries. + DESC + + s.homepage = "https://github.com/signalapp/SignalCoreKit" + s.license = 'GPLv3' + s.author = { "iOS Team" => "ios@signal.org" } + s.source = { :git => "https://github.com/signalapp/SignalCoreKit.git", :tag => s.version.to_s } + s.social_media_url = 'https://twitter.com/signalapp' + + s.platform = :ios, '9.0' + #s.ios.deployment_target = '9.0' + #s.osx.deployment_target = '10.9' + s.requires_arc = true + s.source_files = 'SignalCoreKit/src/**/*.{h,m,mm,swift}' + + # We want to use modules to avoid clobbering CocoaLumberjack macros defined + # by other OWS modules which *also* import CocoaLumberjack. But because we + # also use Objective-C++, modules are disabled unless we explicitly enable + # them + s.compiler_flags = "-fcxx-modules" + + s.prefix_header_file = 'SignalCoreKit/src/TSPrefix.h' + s.xcconfig = { 'OTHER_CFLAGS' => '$(inherited) -DSQLITE_HAS_CODEC' } + + s.resources = ["SignalCoreKit/Resources/Certificates/*"] + + s.dependency 'CocoaLumberjack' + + s.test_spec 'Tests' do |test_spec| + test_spec.source_files = 'SignalCoreKitTests/src/**/*.{h,m,swift}' + end +end diff --git a/SignalCoreKit.xcodeproj/project.pbxproj b/SignalCoreKit.xcodeproj/project.pbxproj new file mode 100644 index 0000000..438c0af --- /dev/null +++ b/SignalCoreKit.xcodeproj/project.pbxproj @@ -0,0 +1,458 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 50; + objects = { + +/* Begin PBXBuildFile section */ + 346941302155549700B5BFAD /* SignalCoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 346941262155549700B5BFAD /* SignalCoreKit.framework */; }; + 346941352155549700B5BFAD /* SignalCoreKitTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 346941342155549700B5BFAD /* SignalCoreKitTests.swift */; }; + 346941372155549700B5BFAD /* SignalCoreKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 346941292155549700B5BFAD /* SignalCoreKit.h */; settings = {ATTRIBUTES = (Public, ); }; }; +/* End PBXBuildFile section */ + +/* Begin PBXContainerItemProxy section */ + 346941312155549700B5BFAD /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 3469411D2155549700B5BFAD /* Project object */; + proxyType = 1; + remoteGlobalIDString = 346941252155549700B5BFAD; + remoteInfo = SignalCoreKit; + }; +/* End PBXContainerItemProxy section */ + +/* Begin PBXFileReference section */ + 346941262155549700B5BFAD /* SignalCoreKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SignalCoreKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 346941292155549700B5BFAD /* SignalCoreKit.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SignalCoreKit.h; sourceTree = ""; }; + 3469412A2155549700B5BFAD /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 3469412F2155549700B5BFAD /* SignalCoreKitTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SignalCoreKitTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 346941342155549700B5BFAD /* SignalCoreKitTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignalCoreKitTests.swift; sourceTree = ""; }; + 346941362155549700B5BFAD /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 346941222155549700B5BFAD /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 3469412C2155549700B5BFAD /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 346941302155549700B5BFAD /* SignalCoreKit.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 3469411C2155549700B5BFAD = { + isa = PBXGroup; + children = ( + 346941282155549700B5BFAD /* SignalCoreKit */, + 346941332155549700B5BFAD /* SignalCoreKitTests */, + 346941272155549700B5BFAD /* Products */, + ); + sourceTree = ""; + }; + 346941272155549700B5BFAD /* Products */ = { + isa = PBXGroup; + children = ( + 346941262155549700B5BFAD /* SignalCoreKit.framework */, + 3469412F2155549700B5BFAD /* SignalCoreKitTests.xctest */, + ); + name = Products; + sourceTree = ""; + }; + 346941282155549700B5BFAD /* SignalCoreKit */ = { + isa = PBXGroup; + children = ( + 346941292155549700B5BFAD /* SignalCoreKit.h */, + 3469412A2155549700B5BFAD /* Info.plist */, + ); + path = SignalCoreKit; + sourceTree = ""; + }; + 346941332155549700B5BFAD /* SignalCoreKitTests */ = { + isa = PBXGroup; + children = ( + 346941342155549700B5BFAD /* SignalCoreKitTests.swift */, + 346941362155549700B5BFAD /* Info.plist */, + ); + path = SignalCoreKitTests; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXHeadersBuildPhase section */ + 346941232155549700B5BFAD /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 346941372155549700B5BFAD /* SignalCoreKit.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXHeadersBuildPhase section */ + +/* Begin PBXNativeTarget section */ + 346941252155549700B5BFAD /* SignalCoreKit */ = { + isa = PBXNativeTarget; + buildConfigurationList = 3469413A2155549700B5BFAD /* Build configuration list for PBXNativeTarget "SignalCoreKit" */; + buildPhases = ( + 346941212155549700B5BFAD /* Sources */, + 346941222155549700B5BFAD /* Frameworks */, + 346941232155549700B5BFAD /* Headers */, + 346941242155549700B5BFAD /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = SignalCoreKit; + productName = SignalCoreKit; + productReference = 346941262155549700B5BFAD /* SignalCoreKit.framework */; + productType = "com.apple.product-type.framework"; + }; + 3469412E2155549700B5BFAD /* SignalCoreKitTests */ = { + isa = PBXNativeTarget; + buildConfigurationList = 3469413D2155549700B5BFAD /* Build configuration list for PBXNativeTarget "SignalCoreKitTests" */; + buildPhases = ( + 3469412B2155549700B5BFAD /* Sources */, + 3469412C2155549700B5BFAD /* Frameworks */, + 3469412D2155549700B5BFAD /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + 346941322155549700B5BFAD /* PBXTargetDependency */, + ); + name = SignalCoreKitTests; + productName = SignalCoreKitTests; + productReference = 3469412F2155549700B5BFAD /* SignalCoreKitTests.xctest */; + productType = "com.apple.product-type.bundle.unit-test"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 3469411D2155549700B5BFAD /* Project object */ = { + isa = PBXProject; + attributes = { + LastSwiftUpdateCheck = 0940; + LastUpgradeCheck = 0940; + ORGANIZATIONNAME = Signal; + TargetAttributes = { + 346941252155549700B5BFAD = { + CreatedOnToolsVersion = 9.4.1; + }; + 3469412E2155549700B5BFAD = { + CreatedOnToolsVersion = 9.4.1; + }; + }; + }; + buildConfigurationList = 346941202155549700B5BFAD /* Build configuration list for PBXProject "SignalCoreKit" */; + compatibilityVersion = "Xcode 9.3"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + ); + mainGroup = 3469411C2155549700B5BFAD; + productRefGroup = 346941272155549700B5BFAD /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 346941252155549700B5BFAD /* SignalCoreKit */, + 3469412E2155549700B5BFAD /* SignalCoreKitTests */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 346941242155549700B5BFAD /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 3469412D2155549700B5BFAD /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 346941212155549700B5BFAD /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 3469412B2155549700B5BFAD /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 346941352155549700B5BFAD /* SignalCoreKitTests.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXTargetDependency section */ + 346941322155549700B5BFAD /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 346941252155549700B5BFAD /* SignalCoreKit */; + targetProxy = 346941312155549700B5BFAD /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + +/* Begin XCBuildConfiguration section */ + 346941382155549700B5BFAD /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_IDENTITY = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + CURRENT_PROJECT_VERSION = 1; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 11.4; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = iphoneos; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Debug; + }; + 346941392155549700B5BFAD /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_IDENTITY = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + CURRENT_PROJECT_VERSION = 1; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + 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; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 11.4; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = iphoneos; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + VALIDATE_PRODUCT = YES; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Release; + }; + 3469413B2155549700B5BFAD /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_IDENTITY = ""; + CODE_SIGN_STYLE = Automatic; + DEFINES_MODULE = YES; + DEVELOPMENT_TEAM = U68MSDN6DR; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + INFOPLIST_FILE = SignalCoreKit/Info.plist; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = org.signal.SignalCoreKit; + PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + SKIP_INSTALL = YES; + SWIFT_VERSION = 4.0; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; + 3469413C2155549700B5BFAD /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_IDENTITY = ""; + CODE_SIGN_STYLE = Automatic; + DEFINES_MODULE = YES; + DEVELOPMENT_TEAM = U68MSDN6DR; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + INFOPLIST_FILE = SignalCoreKit/Info.plist; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = org.signal.SignalCoreKit; + PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + SKIP_INSTALL = YES; + SWIFT_VERSION = 4.0; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Release; + }; + 3469413E2155549700B5BFAD /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Automatic; + DEVELOPMENT_TEAM = U68MSDN6DR; + INFOPLIST_FILE = SignalCoreKitTests/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = org.signal.SignalCoreKitTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 4.0; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; + 3469413F2155549700B5BFAD /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Automatic; + DEVELOPMENT_TEAM = U68MSDN6DR; + INFOPLIST_FILE = SignalCoreKitTests/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = org.signal.SignalCoreKitTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 4.0; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 346941202155549700B5BFAD /* Build configuration list for PBXProject "SignalCoreKit" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 346941382155549700B5BFAD /* Debug */, + 346941392155549700B5BFAD /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 3469413A2155549700B5BFAD /* Build configuration list for PBXNativeTarget "SignalCoreKit" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 3469413B2155549700B5BFAD /* Debug */, + 3469413C2155549700B5BFAD /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 3469413D2155549700B5BFAD /* Build configuration list for PBXNativeTarget "SignalCoreKitTests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 3469413E2155549700B5BFAD /* Debug */, + 3469413F2155549700B5BFAD /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 3469411D2155549700B5BFAD /* Project object */; +} diff --git a/SignalCoreKit.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/SignalCoreKit.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..dea0e3f --- /dev/null +++ b/SignalCoreKit.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/SignalCoreKit.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/SignalCoreKit.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/SignalCoreKit.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/SignalCoreKit.xcodeproj/project.xcworkspace/xcuserdata/matthew.xcuserdatad/UserInterfaceState.xcuserstate b/SignalCoreKit.xcodeproj/project.xcworkspace/xcuserdata/matthew.xcuserdatad/UserInterfaceState.xcuserstate new file mode 100644 index 0000000000000000000000000000000000000000..ae0045b1f37cc7e760dceb0f9d454447f5f37919 GIT binary patch literal 16545 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

joPkus;9!eXr6k$`bG5$^&9F{>ecEu z)$7z-)!WoN)VtIls1K`8s86aJ;O2BeeNlZ$eMSA9`e*h1KtZ5)pfpex=o<*{N(Kf8 zhQPflHn3Y@|3G8lf@TNJ37Qx5LePSsmx5jndL?Lm(8i!mL7RiN!cFe|pzT3B zgLVh)32F$s9rSmwGPrl}(BN^w&%@1bYw&x)+k$rn?+)G*{2AQyjt8F%ZU{aTd?om1 z@K3?N1pgX*C-|@6f3!$Tv;wWCHb@(;ZKv&^?WFCl?Ws-CrfD;@1GL5360K2d(pG9m zYpb+Y?X%j2+LyJjXqRbU)xM_PsNJdkM0-~IrS>cB1?@%cCG8dMciQXP``SOW54C@5 zABEr$F2p0mD?}9H7ZMVZ6p|BS3YieHFl0l>_K@E~9)vv7iF7KRR;Sa2>cVs#b)9ul zx@cXj&a9)l<+^&^+qx~fcXaRRw&`~0cIiIV9n+oAozykxzS3RLUDRFDUD12%ll5l3 zRbQ)rR=-fcRKHxmLjSscjef0uy? lYX0ihkmdAi2kI$L4QVnPJdBoY>*gy401z)q1Z6fu-UM~u+MPVaKzAH_{#9D;f~?1;h$uj%)t#(k?fxw zkgQ1#P7X + + + + SchemeUserState + + SignalCoreKit.xcscheme + + orderHint + 0 + + + + diff --git a/SignalCoreKit/Info.plist b/SignalCoreKit/Info.plist new file mode 100644 index 0000000..1007fd9 --- /dev/null +++ b/SignalCoreKit/Info.plist @@ -0,0 +1,24 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.0 + CFBundleVersion + $(CURRENT_PROJECT_VERSION) + NSPrincipalClass + + + diff --git a/SignalCoreKit/SCKPrefix.h b/SignalCoreKit/SCKPrefix.h new file mode 100644 index 0000000..c87b0f1 --- /dev/null +++ b/SignalCoreKit/SCKPrefix.h @@ -0,0 +1,16 @@ +// +// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// + +#import + +@import CocoaLumberjack; + +#ifdef DEBUG +static const NSUInteger ddLogLevel = DDLogLevelAll; +#else +static const NSUInteger ddLogLevel = DDLogLevelInfo; +#endif +#import "NSObject+OWS.h" +#import "OWSAnalytics.h" +#import "OWSAsserts.h" diff --git a/SignalCoreKit/SignalCoreKit.h b/SignalCoreKit/SignalCoreKit.h new file mode 100644 index 0000000..be4f551 --- /dev/null +++ b/SignalCoreKit/SignalCoreKit.h @@ -0,0 +1,19 @@ +// +// SignalCoreKit.h +// SignalCoreKit +// +// Created by matthew on 9/21/18. +// Copyright © 2018 Signal. All rights reserved. +// + +#import + +//! Project version number for SignalCoreKit. +FOUNDATION_EXPORT double SignalCoreKitVersionNumber; + +//! Project version string for SignalCoreKit. +FOUNDATION_EXPORT const unsigned char SignalCoreKitVersionString[]; + +// In this header, you should import all the public headers of your framework using statements like #import + + diff --git a/SignalCoreKit/src/Logger.swift b/SignalCoreKit/src/Logger.swift new file mode 100644 index 0000000..be05f3e --- /dev/null +++ b/SignalCoreKit/src/Logger.swift @@ -0,0 +1,77 @@ +// +// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// + +import Foundation + +// Once we're on Swift4.2 we can mark this as inlineable +// @inlinable +public func owsFormatLogMessage(_ logString: String, + file: String = #file, + function: String = #function, + line: Int = #line) -> String { + let filename = (file as NSString).lastPathComponent + // We format the filename & line number in a format compatible + // with XCode's "Open Quickly..." feature. + return "[\(filename):\(line) \(function)]: \(logString)" +} + +/** + * A minimal DDLog wrapper for swift. + */ +open class Logger: NSObject { + + open class func verbose(_ logString: @autoclosure () -> String, + file: String = #file, + function: String = #function, + line: Int = #line) { + guard ShouldLogVerbose() else { + return + } + OWSLogger.verbose(owsFormatLogMessage(logString(), file: file, function: function, line: line)) + } + + open class func debug(_ logString: @autoclosure () -> String, + file: String = #file, + function: String = #function, + line: Int = #line) { + guard ShouldLogDebug() else { + return + } + OWSLogger.debug(owsFormatLogMessage(logString(), file: file, function: function, line: line)) + } + + open class func info(_ logString: @autoclosure () -> String, + file: String = #file, + function: String = #function, + line: Int = #line) { + guard ShouldLogInfo() else { + return + } + OWSLogger.info(owsFormatLogMessage(logString(), file: file, function: function, line: line)) + } + + open class func warn(_ logString: @autoclosure () -> String, + file: String = #file, + function: String = #function, + line: Int = #line) { + guard ShouldLogWarning() else { + return + } + OWSLogger.warn(owsFormatLogMessage(logString(), file: file, function: function, line: line)) + } + + open class func error(_ logString: @autoclosure () -> String, + file: String = #file, + function: String = #function, + line: Int = #line) { + guard ShouldLogError() else { + return + } + OWSLogger.error(owsFormatLogMessage(logString(), file: file, function: function, line: line)) + } + + open class func flush() { + OWSLogger.flush() + } +} diff --git a/SignalCoreKit/src/NSData+OWS.h b/SignalCoreKit/src/NSData+OWS.h new file mode 100644 index 0000000..1bf6baa --- /dev/null +++ b/SignalCoreKit/src/NSData+OWS.h @@ -0,0 +1,26 @@ +// +// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface NSData (OWS) + ++ (NSData *)join:(NSArray *)datas; + +- (NSData *)dataByAppendingData:(NSData *)data; + +- (NSString *)hexadecimalString; + +#pragma mark - Base64 + ++ (NSData *)dataFromBase64StringNoPadding:(NSString *)aString; ++ (NSData *)dataFromBase64String:(NSString *)aString; + +- (NSString *)base64EncodedString; + +@end + +NS_ASSUME_NONNULL_END diff --git a/SignalCoreKit/src/NSData+OWS.m b/SignalCoreKit/src/NSData+OWS.m new file mode 100644 index 0000000..2a39f91 --- /dev/null +++ b/SignalCoreKit/src/NSData+OWS.m @@ -0,0 +1,95 @@ +// +// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// + +#import "NSData+OWS.h" + +NS_ASSUME_NONNULL_BEGIN + +@implementation NSData (OWS) + ++ (NSData *)join:(NSArray *)datas +{ + OWSAssert(datas); + + NSMutableData *result = [NSMutableData new]; + for (NSData *data in datas) { + [result appendData:data]; + } + return [result copy]; +} + +- (NSData *)dataByAppendingData:(NSData *)data +{ + NSMutableData *result = [self mutableCopy]; + [result appendData:data]; + return [result copy]; +} + +- (NSString *)hexadecimalString +{ + /* Returns hexadecimal string of NSData. Empty string if data is empty. */ + const unsigned char *dataBuffer = (const unsigned char *)[self bytes]; + if (!dataBuffer) { + return @""; + } + + NSUInteger dataLength = [self length]; + NSMutableString *hexString = [NSMutableString stringWithCapacity:(dataLength * 2)]; + + for (NSUInteger i = 0; i < dataLength; ++i) { + [hexString appendFormat:@"%02x", dataBuffer[i]]; + } + return [hexString copy]; +} + +#pragma mark - Base64 + ++ (NSData *)dataFromBase64StringNoPadding:(NSString *)aString +{ + int padding = aString.length % 4; + + NSMutableString *strResult = [aString mutableCopy]; + if (padding != 0) { + int charsToAdd = 4 - padding; + for (int i = 0; i < charsToAdd; i++) { + [strResult appendString:@"="]; + } + } + return [self dataFromBase64String:strResult]; +} + +// +// dataFromBase64String: +// +// Creates an NSData object containing the base64 decoded representation of +// the base64 string 'aString' +// +// Parameters: +// aString - the base64 string to decode +// +// returns the NSData representation of the base64 string +// + ++ (NSData *)dataFromBase64String:(NSString *)aString +{ + return [[NSData alloc] initWithBase64EncodedString:aString options:NSDataBase64DecodingIgnoreUnknownCharacters]; +} + +// +// base64EncodedString +// +// Creates an NSString object that contains the base 64 encoding of the +// receiver's data. Lines are broken at 64 characters long. +// +// returns an NSString being the base 64 representation of the +// receiver. +// +- (NSString *)base64EncodedString +{ + return [self base64EncodedStringWithOptions:0]; +} + +@end + +NS_ASSUME_NONNULL_END diff --git a/SignalCoreKit/src/NSObject+OWS.h b/SignalCoreKit/src/NSObject+OWS.h new file mode 100644 index 0000000..478a197 --- /dev/null +++ b/SignalCoreKit/src/NSObject+OWS.h @@ -0,0 +1,19 @@ +// +// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// + +NS_ASSUME_NONNULL_BEGIN + +@interface NSObject (OWS) + +#pragma mark - Logging + +@property (nonatomic, readonly) NSString *logTag; + +@property (class, nonatomic, readonly) NSString *logTag; + ++ (BOOL)isNullableObject:(nullable NSObject *)left equalTo:(nullable NSObject *)right; + +@end + +NS_ASSUME_NONNULL_END diff --git a/SignalCoreKit/src/NSObject+OWS.m b/SignalCoreKit/src/NSObject+OWS.m new file mode 100644 index 0000000..6934a0f --- /dev/null +++ b/SignalCoreKit/src/NSObject+OWS.m @@ -0,0 +1,37 @@ +// +// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// + +#import "NSObject+OWS.h" +#import "TSYapDatabaseObject.h" + +NS_ASSUME_NONNULL_BEGIN + +@implementation NSObject (OWS) + +#pragma mark - Logging + ++ (NSString *)logTag +{ + return [NSString stringWithFormat:@"[%@]", self.class]; +} + +- (NSString *)logTag +{ + return self.class.logTag; +} + ++ (BOOL)isNullableObject:(nullable NSObject *)left equalTo:(nullable NSObject *)right +{ + if (!left && !right) { + return YES; + } else if (!left || !right) { + return NO; + } else { + return [left isEqual:right]; + } +} + +@end + +NS_ASSUME_NONNULL_END diff --git a/SignalCoreKit/src/NSString+SSK.h b/SignalCoreKit/src/NSString+SSK.h new file mode 100644 index 0000000..f156c89 --- /dev/null +++ b/SignalCoreKit/src/NSString+SSK.h @@ -0,0 +1,21 @@ +// +// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// + +NS_ASSUME_NONNULL_BEGIN + +@interface NSString (SSK) + +- (NSString *)ows_stripped; + +- (NSString *)filterStringForDisplay; + +- (NSString *)filterFilename; + +- (BOOL)isValidE164; + ++ (NSString *)formatDurationSeconds:(uint32_t)durationSeconds useShortFormat:(BOOL)useShortFormat; + +@end + +NS_ASSUME_NONNULL_END diff --git a/SignalCoreKit/src/NSString+SSK.m b/SignalCoreKit/src/NSString+SSK.m new file mode 100644 index 0000000..a384c0f --- /dev/null +++ b/SignalCoreKit/src/NSString+SSK.m @@ -0,0 +1,372 @@ +// +// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// + +#import "NSString+SSK.h" +#import "iOSVersions.h" + +NS_ASSUME_NONNULL_BEGIN + +@interface UnicodeCodeRange : NSObject + +@property (nonatomic) unichar first; +@property (nonatomic) unichar last; + +@end + +#pragma mark - + +@implementation UnicodeCodeRange + ++ (UnicodeCodeRange *)rangeWithStart:(unichar)first last:(unichar)last +{ + OWSAssertDebug(first <= last); + + UnicodeCodeRange *range = [UnicodeCodeRange new]; + range.first = first; + range.last = last; + return range; +} + +- (NSComparisonResult)compare:(UnicodeCodeRange *)other +{ + + return self.first > other.first; +} + +@end + +#pragma mark - + +@implementation NSString (SSK) + +- (NSString *)ows_stripped +{ + return [self stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]]; +} + ++ (BOOL)shouldFilterIndic +{ + static BOOL result = NO; + static dispatch_once_t onceToken; + dispatch_once(&onceToken, ^{ + result = (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(11, 0) && !SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(11, 3)); + }); + return result; +} + ++ (BOOL)isIndicVowel:(unichar)c +{ + static NSArray *ranges; + static dispatch_once_t onceToken; + dispatch_once(&onceToken, ^{ + // From: + // https://unicode.org/charts/PDF/U0C00.pdf + // https://unicode.org/charts/PDF/U0980.pdf + // https://unicode.org/charts/PDF/U0900.pdf + ranges = [@[ + // Telugu: + [UnicodeCodeRange rangeWithStart:0xC05 last:0xC14], + [UnicodeCodeRange rangeWithStart:0xC3E last:0xC4C], + [UnicodeCodeRange rangeWithStart:0xC60 last:0xC63], + // Bengali + [UnicodeCodeRange rangeWithStart:0x985 last:0x994], + [UnicodeCodeRange rangeWithStart:0x9BE last:0x9C8], + [UnicodeCodeRange rangeWithStart:0x9CB last:0x9CC], + [UnicodeCodeRange rangeWithStart:0x9E0 last:0x9E3], + // Devanagari + [UnicodeCodeRange rangeWithStart:0x904 last:0x914], + [UnicodeCodeRange rangeWithStart:0x93A last:0x93B], + [UnicodeCodeRange rangeWithStart:0x93E last:0x94C], + [UnicodeCodeRange rangeWithStart:0x94E last:0x94F], + [UnicodeCodeRange rangeWithStart:0x955 last:0x957], + [UnicodeCodeRange rangeWithStart:0x960 last:0x963], + [UnicodeCodeRange rangeWithStart:0x972 last:0x977], + ] sortedArrayUsingSelector:@selector(compare:)]; + }); + + for (UnicodeCodeRange *range in ranges) { + if (c < range.first) { + // For perf, we can take advantage of the fact that the + // ranges are sorted to exit early if the character lies + // before the current range. + return NO; + } + if (range.first <= c && c <= range.last) { + return YES; + } + } + return NO; +} + ++ (NSCharacterSet *)problematicCharacterSetForIndicScript +{ + static NSCharacterSet *characterSet; + static dispatch_once_t onceToken; + dispatch_once(&onceToken, ^{ + characterSet = [NSCharacterSet characterSetWithCharactersInString:@"\u200C"]; + }); + + return characterSet; +} + +// See: https://manishearth.github.io/blog/2018/02/15/picking-apart-the-crashing-ios-string/ +- (NSString *)filterForIndicScripts +{ + if (!NSString.shouldFilterIndic) { + return self; + } + + if ([self rangeOfCharacterFromSet:[[self class] problematicCharacterSetForIndicScript]].location == NSNotFound) { + return self; + } + + NSMutableString *filteredForIndic = [NSMutableString new]; + for (NSUInteger index = 0; index < self.length; index++) { + unichar c = [self characterAtIndex:index]; + if (c == 0x200C) { + NSUInteger nextIndex = index + 1; + if (nextIndex < self.length) { + unichar next = [self characterAtIndex:nextIndex]; + if ([NSString isIndicVowel:next]) { + // Discard ZWNJ (zero-width non-joiner) whenever we find a ZWNJ + // followed by an Indic (Telugu, Bengali, Devanagari) vowel + // and replace it with 0xFFFD, the Unicode "replacement character." + [filteredForIndic appendFormat:@"\uFFFD"]; + OWSLogError(@"Filtered unsafe Indic script."); + // Then discard the vowel too. + index++; + continue; + } + } + } + [filteredForIndic appendFormat:@"%C", c]; + } + return [filteredForIndic copy]; +} + ++ (NSCharacterSet *)unsafeFilenameCharacterSet +{ + static NSCharacterSet *characterSet; + static dispatch_once_t onceToken; + dispatch_once(&onceToken, ^{ + // 0x202D and 0x202E are the unicode ordering letters + // and can be used to control the rendering of text. + // They could be used to construct misleading attachment + // filenames that appear to have a different file extension, + // for example. + characterSet = [NSCharacterSet characterSetWithCharactersInString:@"\u202D\u202E"]; + }); + + return characterSet; +} + +- (NSString *)filterUnsafeFilenameCharacters +{ + NSCharacterSet *unsafeCharacterSet = [[self class] unsafeFilenameCharacterSet]; + NSRange range = [self rangeOfCharacterFromSet:unsafeCharacterSet]; + if (range.location == NSNotFound) { + return self; + } + NSMutableString *filtered = [NSMutableString new]; + NSString *remainder = [self copy]; + while (range.location != NSNotFound) { + if (range.location > 0) { + [filtered appendString:[remainder substringToIndex:range.location]]; + } + // The "replacement" code point. + [filtered appendString:@"\uFFFD"]; + remainder = [remainder substringFromIndex:range.location + range.length]; + range = [remainder rangeOfCharacterFromSet:unsafeCharacterSet]; + } + [filtered appendString:remainder]; + return filtered; +} + +- (NSString *)filterStringForDisplay +{ + return self.ows_stripped.filterForIndicScripts.filterForExcessiveDiacriticals; +} + +- (NSString *)filterFilename +{ + return self.ows_stripped.filterForIndicScripts.filterForExcessiveDiacriticals.filterUnsafeFilenameCharacters; +} + +- (NSString *)filterForExcessiveDiacriticals +{ + if (!self.hasExcessiveDiacriticals) { + return self; + } + return [self stringByFoldingWithOptions:NSDiacriticInsensitiveSearch locale:[NSLocale currentLocale]]; +} + +- (BOOL)hasExcessiveDiacriticals +{ + // discard any zalgo style text, by detecting maximum number of glyphs per character + NSUInteger index = 0; + while (index < self.length) { + // Walk the grapheme clusters in the string. + NSRange range = [self rangeOfComposedCharacterSequenceAtIndex:index]; + if (range.length > 8) { + // There are too many characters in this grapheme cluster. + return YES; + } else if (range.location != index || range.length < 1) { + // This should never happen. + OWSFailDebug( + @"unexpected composed character sequence: %lu, %@", (unsigned long)index, NSStringFromRange(range)); + return YES; + } + index = range.location + range.length; + } + return NO; +} + +- (BOOL)isValidE164 +{ + NSError *error = nil; + NSRegularExpression *regex = [NSRegularExpression regularExpressionWithPattern:@"^\\+\\d+$" + options:NSRegularExpressionCaseInsensitive + error:&error]; + if (error || !regex) { + OWSFailDebug(@"could not compile regex: %@", error); + return NO; + } + return [regex rangeOfFirstMatchInString:self options:0 range:NSMakeRange(0, self.length)].location != NSNotFound; +} + ++ (NSString *)formatDurationSeconds:(uint32_t)durationSeconds useShortFormat:(BOOL)useShortFormat +{ + NSString *amountFormat; + uint32_t duration; + + uint32_t secondsPerMinute = 60; + uint32_t secondsPerHour = secondsPerMinute * 60; + uint32_t secondsPerDay = secondsPerHour * 24; + uint32_t secondsPerWeek = secondsPerDay * 7; + + if (durationSeconds < secondsPerMinute) { // XX Seconds + if (useShortFormat) { + amountFormat = NSLocalizedString(@"TIME_AMOUNT_SECONDS_SHORT_FORMAT", + @"Label text below navbar button, embeds {{number of seconds}}. Must be very short, like 1 or 2 " + @"characters, The space is intentionally omitted between the text and the embedded duration so that " + @"we get, e.g. '5s' not '5 s'. See other *_TIME_AMOUNT strings"); + } else { + amountFormat = NSLocalizedString(@"TIME_AMOUNT_SECONDS", + @"{{number of seconds}} embedded in strings, e.g. 'Alice updated disappearing messages " + @"expiration to {{5 seconds}}'. See other *_TIME_AMOUNT strings"); + } + + duration = durationSeconds; + } else if (durationSeconds < secondsPerMinute * 1.5) { // 1 Minute + if (useShortFormat) { + amountFormat = NSLocalizedString(@"TIME_AMOUNT_MINUTES_SHORT_FORMAT", + @"Label text below navbar button, embeds {{number of minutes}}. Must be very short, like 1 or 2 " + @"characters, The space is intentionally omitted between the text and the embedded duration so that " + @"we get, e.g. '5m' not '5 m'. See other *_TIME_AMOUNT strings"); + } else { + amountFormat = NSLocalizedString(@"TIME_AMOUNT_SINGLE_MINUTE", + @"{{1 minute}} embedded in strings, e.g. 'Alice updated disappearing messages " + @"expiration to {{1 minute}}'. See other *_TIME_AMOUNT strings"); + } + duration = durationSeconds / secondsPerMinute; + } else if (durationSeconds < secondsPerHour) { // Multiple Minutes + if (useShortFormat) { + amountFormat = NSLocalizedString(@"TIME_AMOUNT_MINUTES_SHORT_FORMAT", + @"Label text below navbar button, embeds {{number of minutes}}. Must be very short, like 1 or 2 " + @"characters, The space is intentionally omitted between the text and the embedded duration so that " + @"we get, e.g. '5m' not '5 m'. See other *_TIME_AMOUNT strings"); + } else { + amountFormat = NSLocalizedString(@"TIME_AMOUNT_MINUTES", + @"{{number of minutes}} embedded in strings, e.g. 'Alice updated disappearing messages " + @"expiration to {{5 minutes}}'. See other *_TIME_AMOUNT strings"); + } + + duration = durationSeconds / secondsPerMinute; + } else if (durationSeconds < secondsPerHour * 1.5) { // 1 Hour + if (useShortFormat) { + amountFormat = NSLocalizedString(@"TIME_AMOUNT_HOURS_SHORT_FORMAT", + @"Label text below navbar button, embeds {{number of hours}}. Must be very short, like 1 or 2 " + @"characters, The space is intentionally omitted between the text and the embedded duration so that " + @"we get, e.g. '5h' not '5 h'. See other *_TIME_AMOUNT strings"); + } else { + amountFormat = NSLocalizedString(@"TIME_AMOUNT_SINGLE_HOUR", + @"{{1 hour}} embedded in strings, e.g. 'Alice updated disappearing messages " + @"expiration to {{1 hour}}'. See other *_TIME_AMOUNT strings"); + } + + duration = durationSeconds / secondsPerHour; + } else if (durationSeconds < secondsPerDay) { // Multiple Hours + if (useShortFormat) { + amountFormat = NSLocalizedString(@"TIME_AMOUNT_HOURS_SHORT_FORMAT", + @"Label text below navbar button, embeds {{number of hours}}. Must be very short, like 1 or 2 " + @"characters, The space is intentionally omitted between the text and the embedded duration so that " + @"we get, e.g. '5h' not '5 h'. See other *_TIME_AMOUNT strings"); + } else { + amountFormat = NSLocalizedString(@"TIME_AMOUNT_HOURS", + @"{{number of hours}} embedded in strings, e.g. 'Alice updated disappearing messages " + @"expiration to {{5 hours}}'. See other *_TIME_AMOUNT strings"); + } + + duration = durationSeconds / secondsPerHour; + } else if (durationSeconds < secondsPerDay * 1.5) { // 1 Day + if (useShortFormat) { + amountFormat = NSLocalizedString(@"TIME_AMOUNT_DAYS_SHORT_FORMAT", + @"Label text below navbar button, embeds {{number of days}}. Must be very short, like 1 or 2 " + @"characters, The space is intentionally omitted between the text and the embedded duration so that " + @"we get, e.g. '5d' not '5 d'. See other *_TIME_AMOUNT strings"); + } else { + amountFormat = NSLocalizedString(@"TIME_AMOUNT_SINGLE_DAY", + @"{{1 day}} embedded in strings, e.g. 'Alice updated disappearing messages " + @"expiration to {{1 day}}'. See other *_TIME_AMOUNT strings"); + } + + duration = durationSeconds / secondsPerDay; + } else if (durationSeconds < secondsPerWeek) { // Multiple Days + if (useShortFormat) { + amountFormat = NSLocalizedString(@"TIME_AMOUNT_DAYS_SHORT_FORMAT", + @"Label text below navbar button, embeds {{number of days}}. Must be very short, like 1 or 2 " + @"characters, The space is intentionally omitted between the text and the embedded duration so that " + @"we get, e.g. '5d' not '5 d'. See other *_TIME_AMOUNT strings"); + } else { + amountFormat = NSLocalizedString(@"TIME_AMOUNT_DAYS", + @"{{number of days}} embedded in strings, e.g. 'Alice updated disappearing messages " + @"expiration to {{5 days}}'. See other *_TIME_AMOUNT strings"); + } + + duration = durationSeconds / secondsPerDay; + } else if (durationSeconds < secondsPerWeek * 1.5) { // 1 Week + if (useShortFormat) { + amountFormat = NSLocalizedString(@"TIME_AMOUNT_WEEKS_SHORT_FORMAT", + @"Label text below navbar button, embeds {{number of weeks}}. Must be very short, like 1 or 2 " + @"characters, The space is intentionally omitted between the text and the embedded duration so that " + @"we get, e.g. '5w' not '5 w'. See other *_TIME_AMOUNT strings"); + } else { + amountFormat = NSLocalizedString(@"TIME_AMOUNT_SINGLE_WEEK", + @"{{1 week}} embedded in strings, e.g. 'Alice updated disappearing messages " + @"expiration to {{1 week}}'. See other *_TIME_AMOUNT strings"); + } + + duration = durationSeconds / secondsPerWeek; + } else { // Multiple weeks + if (useShortFormat) { + amountFormat = NSLocalizedString(@"TIME_AMOUNT_WEEKS_SHORT_FORMAT", + @"Label text below navbar button, embeds {{number of weeks}}. Must be very short, like 1 or 2 " + @"characters, The space is intentionally omitted between the text and the embedded duration so that " + @"we get, e.g. '5w' not '5 w'. See other *_TIME_AMOUNT strings"); + } else { + amountFormat = NSLocalizedString(@"TIME_AMOUNT_WEEKS", + @"{{number of weeks}}, embedded in strings, e.g. 'Alice updated disappearing messages " + @"expiration to {{5 weeks}}'. See other *_TIME_AMOUNT strings"); + } + + duration = durationSeconds / secondsPerWeek; + } + + return [NSString stringWithFormat:amountFormat, + [NSNumberFormatter localizedStringFromNumber:@(duration) numberStyle:NSNumberFormatterNoStyle]]; +} + +@end + +NS_ASSUME_NONNULL_END diff --git a/SignalCoreKit/src/OWSAsserts.h b/SignalCoreKit/src/OWSAsserts.h new file mode 100755 index 0000000..61427a5 --- /dev/null +++ b/SignalCoreKit/src/OWSAsserts.h @@ -0,0 +1,236 @@ +// +// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// + +#import "AppContext.h" +#import "OWSLogger.h" + +NS_ASSUME_NONNULL_BEGIN + +#ifndef OWSAssert + +#define CONVERT_TO_STRING(X) #X +#define CONVERT_EXPR_TO_STRING(X) CONVERT_TO_STRING(X) + +#ifdef DEBUG + +#define USE_ASSERTS + +// OWSAssertDebug() and OWSFailDebug() should be used in Obj-C methods. +// OWSCAssertDebug() and OWSCFailDebug() should be used in free functions. + +#define OWSAssertDebug(X) \ + do { \ + if (!(X)) { \ + OWSLogError(@"Assertion failed: %s", CONVERT_EXPR_TO_STRING(X)); \ + [DDLog flushLog]; \ + NSAssert(0, @"Assertion failed: %s", CONVERT_EXPR_TO_STRING(X)); \ + } \ + } while (NO) + +#define OWSCAssertDebug(X) \ + do { \ + if (!(X)) { \ + OWSLogError(@"Assertion failed: %s", CONVERT_EXPR_TO_STRING(X)); \ + [DDLog flushLog]; \ + NSCAssert(0, @"Assertion failed: %s", CONVERT_EXPR_TO_STRING(X)); \ + } \ + } while (NO) + +#define OWSFailWithoutLogging(message, ...) \ + do { \ + NSString *formattedMessage = [NSString stringWithFormat:message, ##__VA_ARGS__]; \ + NSAssert(0, formattedMessage); \ + } while (NO) + +#define OWSCFailWithoutLogging(message, ...) \ + do { \ + NSString *formattedMessage = [NSString stringWithFormat:message, ##__VA_ARGS__]; \ + NSCAssert(0, formattedMessage); \ + } while (NO) + +#define OWSFailNoFormat(message) \ + do { \ + OWSLogError(@"%@", message); \ + [DDLog flushLog]; \ + NSAssert(0, message); \ + } while (NO) + +#define OWSCFailNoFormat(message) \ + do { \ + OWSLogError(@"%@", message); \ + [DDLog flushLog]; \ + NSCAssert(0, message); \ + } while (NO) + +#else + +#define OWSAssertDebug(X) +#define OWSCAssertDebug(X) +#define OWSFailWithoutLogging(message, ...) +#define OWSCFailWithoutLogging(message, ...) +#define OWSFailNoFormat(X) +#define OWSCFailNoFormat(X) + +#endif + +#endif + +// Like OWSAssertDebug, but will fail in production, terminating the app +#define OWSAssert(X) \ + do { \ + if (!(X)) { \ + OWSFail(@"Assertion failed: %s", CONVERT_EXPR_TO_STRING(X)); \ + } \ + } while (NO) + +#define OWSCAssert(X) \ + do { \ + if (!(X)) { \ + OWSCFail(@"Assertion failed: %s", CONVERT_EXPR_TO_STRING(X)); \ + } \ + } while (NO) + +#define OWSAbstractMethod() OWSFail(@"Method needs to be implemented by subclasses.") + +#pragma mark - Singleton Asserts + +// The "singleton asserts" can be used to ensure +// that we only create a singleton once. +// +// The simplest way to use them is the OWSSingletonAssert() macro. +// It is intended to be used inside the singleton's initializer. +// +// If, however, a singleton has multiple possible initializers, +// you need to: +// +// 1. Use OWSSingletonAssertFlag() outside the class definition. +// 2. Use OWSSingletonAssertInit() in each initializer. + +#ifdef DEBUG + +#define ENFORCE_SINGLETONS + +#endif + +#ifdef ENFORCE_SINGLETONS + +#define OWSSingletonAssertFlag() static BOOL _isSingletonCreated = NO; + +#define OWSSingletonAssertInit() \ + @synchronized([self class]) \ + { \ + if (!CurrentAppContext().isRunningTests) { \ + OWSAssertDebug(!_isSingletonCreated); \ + _isSingletonCreated = YES; \ + } \ + } + +#define OWSSingletonAssert() OWSSingletonAssertFlag() OWSSingletonAssertInit() + +#else + +#define OWSSingletonAssertFlag() +#define OWSSingletonAssertInit() +#define OWSSingletonAssert() + +#endif + +// This macro is intended for use in Objective-C. +#define OWSAssertIsOnMainThread() OWSCAssertDebug([NSThread isMainThread]) + +#define OWSFailDebug(_messageFormat, ...) \ + do { \ + OWSLogError(_messageFormat, ##__VA_ARGS__); \ + [DDLog flushLog]; \ + OWSFailWithoutLogging(_messageFormat, ##__VA_ARGS__); \ + } while (0) + +#define OWSCFailDebug(_messageFormat, ...) \ + do { \ + OWSLogError(_messageFormat, ##__VA_ARGS__); \ + [DDLog flushLog]; \ + OWSCFailWithoutLogging(_messageFormat, ##__VA_ARGS__); \ + } while (NO) + + +#define OWSFail(_messageFormat, ...) \ + do { \ + OWSFailDebug(_messageFormat, ##__VA_ARGS__); \ + exit(0); \ + } while (0) + +#define OWSCFail(_messageFormat, ...) \ + do { \ + OWSCFailDebug(_messageFormat, ##__VA_ARGS__); \ + exit(0); \ + } while (NO) + +// Avoids Clang analyzer warning: +// Value stored to 'x' during it's initialization is never read +#define SUPPRESS_DEADSTORE_WARNING(x) \ + do { \ + (void)x; \ + } while (0) + +__attribute__((annotate("returns_localized_nsstring"))) static inline NSString *LocalizationNotNeeded(NSString *s) +{ + return s; +} + +#define OWSRaiseException(name, formatParam, ...) \ + do { \ + OWSLogError(@"Exception: %@ %@", name, [NSString stringWithFormat:formatParam, ##__VA_ARGS__]); \ + [DDLog flushLog]; \ + @throw [NSException exceptionWithName:name \ + reason:[NSString stringWithFormat:formatParam, ##__VA_ARGS__] \ + userInfo:nil]; \ + } while (NO) + +#define OWSRaiseExceptionWithUserInfo(name, userInfoParam, formatParam, ...) \ + do { \ + OWSLogError( \ + @"Exception: %@ %@ %@", name, userInfoParam, [NSString stringWithFormat:formatParam, ##__VA_ARGS__]); \ + [DDLog flushLog]; \ + @throw [NSException exceptionWithName:name \ + reason:[NSString stringWithFormat:formatParam, ##__VA_ARGS__] \ + userInfo:userInfoParam]; \ + } while (NO) + + +// UI JANK +// +// In pursuit of smooth UI, we want to continue moving blocking operations off the main thread. +// Add `OWSJanksUI` in code paths that shouldn't be called on the main thread. +// Because we have pervasively broken this tenant, enabling it by default would be too disruptive +// but it's helpful while unjanking and maybe someday we can have it enabled by default. +//#define DEBUG_UI_JANK 1 + +#ifdef DEBUG +#ifdef DEBUG_UI_JANK +#define OWSJanksUI() \ + do { \ + OWSAssertDebug(![NSThread isMainThread]) \ + } while (NO) +#endif +#endif + +#ifndef OWSJanksUI +#define OWSJanksUI() +#endif + +#pragma mark - Overflow Math + +#define ows_add_overflow(a, b, resultRef) \ + do { \ + BOOL _didOverflow = __builtin_add_overflow(a, b, resultRef); \ + OWSAssert(!_didOverflow); \ + } while (NO) + +#define ows_sub_overflow(a, b, resultRef) \ + do { \ + BOOL _didOverflow = __builtin_sub_overflow(a, b, resultRef); \ + OWSAssert(!_didOverflow); \ + } while (NO) + +NS_ASSUME_NONNULL_END diff --git a/SignalCoreKit/src/OWSAsserts.m b/SignalCoreKit/src/OWSAsserts.m new file mode 100755 index 0000000..043db9c --- /dev/null +++ b/SignalCoreKit/src/OWSAsserts.m @@ -0,0 +1,9 @@ +// +// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// + +#import "OWSAsserts.h" + +NS_ASSUME_NONNULL_BEGIN + +NS_ASSUME_NONNULL_END diff --git a/SignalCoreKit/src/OWSFileSystem.h b/SignalCoreKit/src/OWSFileSystem.h new file mode 100644 index 0000000..b56e9f4 --- /dev/null +++ b/SignalCoreKit/src/OWSFileSystem.h @@ -0,0 +1,50 @@ +// +// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// + +NS_ASSUME_NONNULL_BEGIN + +@interface OWSFileSystem : NSObject + +- (instancetype)init NS_UNAVAILABLE; + ++ (BOOL)protectFileOrFolderAtPath:(NSString *)path; ++ (BOOL)protectFileOrFolderAtPath:(NSString *)path fileProtectionType:(NSFileProtectionType)fileProtectionType; + ++ (BOOL)protectRecursiveContentsAtPath:(NSString *)path; + ++ (NSString *)appDocumentDirectoryPath; + ++ (NSString *)appLibraryDirectoryPath; + ++ (NSString *)appSharedDataDirectoryPath; + ++ (NSString *)cachesDirectoryPath; + ++ (nullable NSError *)renameFilePathUsingRandomExtension:(NSString *)oldFilePath; + ++ (nullable NSError *)moveAppFilePath:(NSString *)oldFilePath sharedDataFilePath:(NSString *)newFilePath; + +// Returns NO IFF the directory does not exist and could not be created. ++ (BOOL)ensureDirectoryExists:(NSString *)dirPath; + ++ (BOOL)ensureFileExists:(NSString *)filePath; + ++ (BOOL)deleteFile:(NSString *)filePath; + ++ (BOOL)deleteFileIfExists:(NSString *)filePath; + ++ (NSArray *_Nullable)allFilesInDirectoryRecursive:(NSString *)dirPath error:(NSError **)error; + ++ (NSString *)temporaryFilePath; ++ (NSString *)temporaryFilePathWithFileExtension:(NSString *_Nullable)fileExtension; + +// Returns nil on failure. ++ (nullable NSString *)writeDataToTemporaryFile:(NSData *)data fileExtension:(NSString *_Nullable)fileExtension; + ++ (nullable NSNumber *)fileSizeOfPath:(NSString *)filePath; ++ (void)logAttributesOfItemAtPathRecursively:(NSString *)path; + +@end + +NS_ASSUME_NONNULL_END diff --git a/SignalCoreKit/src/OWSFileSystem.m b/SignalCoreKit/src/OWSFileSystem.m new file mode 100644 index 0000000..3b43014 --- /dev/null +++ b/SignalCoreKit/src/OWSFileSystem.m @@ -0,0 +1,334 @@ +// +// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// + +#import "OWSFileSystem.h" +#import "OWSError.h" +#import "TSConstants.h" + +NS_ASSUME_NONNULL_BEGIN + +@implementation OWSFileSystem + ++ (BOOL)protectRecursiveContentsAtPath:(NSString *)path +{ + BOOL isDirectory; + if (![NSFileManager.defaultManager fileExistsAtPath:path isDirectory:&isDirectory]) { + return NO; + } + + if (!isDirectory) { + return [self protectFileOrFolderAtPath:path]; + } + NSString *dirPath = path; + + BOOL success = YES; + NSDirectoryEnumerator *directoryEnumerator = [[NSFileManager defaultManager] enumeratorAtPath:dirPath]; + + for (NSString *relativePath in directoryEnumerator) { + NSString *filePath = [dirPath stringByAppendingPathComponent:relativePath]; + OWSLogDebug(@"path: %@ had attributes: %@", filePath, directoryEnumerator.fileAttributes); + + success = success && [self protectFileOrFolderAtPath:filePath]; + } + + OWSLogInfo(@"protected contents at path: %@", path); + return success; +} + ++ (BOOL)protectFileOrFolderAtPath:(NSString *)path +{ + return + [self protectFileOrFolderAtPath:path fileProtectionType:NSFileProtectionCompleteUntilFirstUserAuthentication]; +} + ++ (BOOL)protectFileOrFolderAtPath:(NSString *)path fileProtectionType:(NSFileProtectionType)fileProtectionType +{ + OWSLogVerbose(@"protecting file at path: %@", path); + if (![NSFileManager.defaultManager fileExistsAtPath:path]) { + return NO; + } + + NSError *error; + NSDictionary *fileProtection = @{ NSFileProtectionKey : fileProtectionType }; + [[NSFileManager defaultManager] setAttributes:fileProtection ofItemAtPath:path error:&error]; + + NSDictionary *resourcesAttrs = @{ NSURLIsExcludedFromBackupKey : @YES }; + + NSURL *ressourceURL = [NSURL fileURLWithPath:path]; + BOOL success = [ressourceURL setResourceValues:resourcesAttrs error:&error]; + + if (error || !success) { + OWSFailDebug(@"Could not protect file or folder: %@", error); + OWSProdCritical([OWSAnalyticsEvents storageErrorFileProtection]); + return NO; + } + return YES; +} + ++ (void)logAttributesOfItemAtPathRecursively:(NSString *)path +{ + BOOL isDirectory; + BOOL exists = [[NSFileManager defaultManager] fileExistsAtPath:path isDirectory:&isDirectory]; + if (!exists) { + OWSFailDebug(@"error retrieving file attributes for missing file"); + return; + } + + if (isDirectory) { + NSDirectoryEnumerator *directoryEnumerator = [[NSFileManager defaultManager] enumeratorAtPath:(NSString *)path]; + for (NSString *path in directoryEnumerator) { + OWSLogDebug(@"path: %@ has attributes: %@", path, directoryEnumerator.fileAttributes); + } + } else { + NSError *error; + NSDictionary *_Nullable attributes = + [[NSFileManager defaultManager] attributesOfItemAtPath:path error:&error]; + if (error) { + OWSFailDebug(@"error retrieving file attributes: %@", error); + } else { + OWSLogDebug(@"path: %@ has attributes: %@", path, attributes); + } + } +} + ++ (NSString *)appLibraryDirectoryPath +{ + NSFileManager *fileManager = [NSFileManager defaultManager]; + NSURL *documentDirectoryURL = + [[fileManager URLsForDirectory:NSLibraryDirectory inDomains:NSUserDomainMask] lastObject]; + return [documentDirectoryURL path]; +} + ++ (NSString *)appDocumentDirectoryPath +{ + return CurrentAppContext().appDocumentDirectoryPath; +} + ++ (NSString *)appSharedDataDirectoryPath +{ + return CurrentAppContext().appSharedDataDirectoryPath; +} + ++ (NSString *)cachesDirectoryPath +{ + NSArray *paths = NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES); + OWSAssertDebug(paths.count >= 1); + return paths[0]; +} + ++ (nullable NSError *)renameFilePathUsingRandomExtension:(NSString *)oldFilePath +{ + NSFileManager *fileManager = [NSFileManager defaultManager]; + if (![fileManager fileExistsAtPath:oldFilePath]) { + return nil; + } + + NSString *newFilePath = + [[oldFilePath stringByAppendingString:@"."] stringByAppendingString:[NSUUID UUID].UUIDString]; + + OWSLogInfo(@"Moving file or directory from: %@ to: %@", oldFilePath, newFilePath); + + NSError *_Nullable error; + BOOL success = [fileManager moveItemAtPath:oldFilePath toPath:newFilePath error:&error]; + if (!success || error) { + OWSLogDebug(@"Could not move file or directory from: %@ to: %@, error: %@", oldFilePath, newFilePath, error); + OWSFailDebug(@"Could not move file or directory with error: %@", error); + return error; + } + return nil; +} + ++ (nullable NSError *)moveAppFilePath:(NSString *)oldFilePath sharedDataFilePath:(NSString *)newFilePath +{ + NSFileManager *fileManager = [NSFileManager defaultManager]; + if (![fileManager fileExistsAtPath:oldFilePath]) { + return nil; + } + + OWSLogInfo(@"Moving file or directory from: %@ to: %@", oldFilePath, newFilePath); + + if ([fileManager fileExistsAtPath:newFilePath]) { + // If a file/directory already exists at the destination, + // try to move it "aside" by renaming it with an extension. + NSError *_Nullable error = [self renameFilePathUsingRandomExtension:newFilePath]; + if (error) { + return error; + } + } + + if ([fileManager fileExistsAtPath:newFilePath]) { + OWSLogDebug( + @"Can't move file or directory from: %@ to: %@; destination already exists.", oldFilePath, newFilePath); + OWSFailDebug(@"Can't move file or directory; destination already exists."); + return OWSErrorWithCodeDescription( + OWSErrorCodeMoveFileToSharedDataContainerError, @"Can't move file; destination already exists."); + } + + NSDate *startDate = [NSDate new]; + + NSError *_Nullable error; + BOOL success = [fileManager moveItemAtPath:oldFilePath toPath:newFilePath error:&error]; + if (!success || error) { + OWSLogDebug(@"Could not move file or directory from: %@ to: %@, error: %@", oldFilePath, newFilePath, error); + OWSFailDebug(@"Could not move file or directory with error: %@", error); + return error; + } + + OWSLogInfo(@"Moved file or directory in: %f", fabs([startDate timeIntervalSinceNow])); + OWSLogDebug(@"Moved file or directory from: %@ to: %@ in: %f", + oldFilePath, + newFilePath, + fabs([startDate timeIntervalSinceNow])); + + // Ensure all files moved have the proper data protection class. + // On large directories this can take a while, so we dispatch async + // since we're in the launch path. + dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{ + [self protectRecursiveContentsAtPath:newFilePath]; + }); + + return nil; +} + ++ (BOOL)ensureDirectoryExists:(NSString *)dirPath +{ + BOOL isDirectory; + BOOL exists = [[NSFileManager defaultManager] fileExistsAtPath:dirPath isDirectory:&isDirectory]; + if (exists) { + OWSAssertDebug(isDirectory); + + return [self protectFileOrFolderAtPath:dirPath]; + } else { + OWSLogInfo(@"Creating directory at: %@", dirPath); + + NSError *error = nil; + [[NSFileManager defaultManager] createDirectoryAtPath:dirPath + withIntermediateDirectories:YES + attributes:nil + error:&error]; + if (error) { + OWSFailDebug(@"Failed to create directory: %@, error: %@", dirPath, error); + return NO; + } + return [self protectFileOrFolderAtPath:dirPath]; + } +} + ++ (BOOL)ensureFileExists:(NSString *)filePath +{ + BOOL exists = [[NSFileManager defaultManager] fileExistsAtPath:filePath]; + if (exists) { + return [self protectFileOrFolderAtPath:filePath]; + } else { + BOOL success = [[NSFileManager defaultManager] createFileAtPath:filePath contents:nil attributes:nil]; + if (!success) { + OWSFailDebug(@"Failed to create file."); + return NO; + } + return [self protectFileOrFolderAtPath:filePath]; + } +} + ++ (BOOL)deleteFile:(NSString *)filePath +{ + NSError *error; + BOOL success = [[NSFileManager defaultManager] removeItemAtPath:filePath error:&error]; + if (!success || error) { + OWSLogError(@"Failed to delete file: %@", error.description); + return NO; + } + return YES; +} + ++ (BOOL)deleteFileIfExists:(NSString *)filePath +{ + if (![[NSFileManager defaultManager] fileExistsAtPath:filePath]) { + return YES; + } + return [self deleteFile:filePath]; +} + ++ (NSArray *_Nullable)allFilesInDirectoryRecursive:(NSString *)dirPath error:(NSError **)error +{ + OWSAssertDebug(dirPath.length > 0); + + *error = nil; + + NSArray *filenames = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:dirPath error:error]; + if (*error) { + OWSFailDebug(@"could not find files in directory: %@", *error); + return nil; + } + + NSMutableArray *filePaths = [NSMutableArray new]; + + for (NSString *filename in filenames) { + NSString *filePath = [dirPath stringByAppendingPathComponent:filename]; + + BOOL isDirectory; + [[NSFileManager defaultManager] fileExistsAtPath:filePath isDirectory:&isDirectory]; + if (isDirectory) { + [filePaths addObjectsFromArray:[self allFilesInDirectoryRecursive:filePath error:error]]; + if (*error) { + return nil; + } + } else { + [filePaths addObject:filePath]; + } + } + + return filePaths; +} + ++ (NSString *)temporaryFilePath +{ + return [self temporaryFilePathWithFileExtension:nil]; +} + ++ (NSString *)temporaryFilePathWithFileExtension:(NSString *_Nullable)fileExtension +{ + NSString *temporaryDirectory = NSTemporaryDirectory(); + NSString *tempFileName = NSUUID.UUID.UUIDString; + if (fileExtension.length > 0) { + tempFileName = [[tempFileName stringByAppendingString:@"."] stringByAppendingString:fileExtension]; + } + NSString *tempFilePath = [temporaryDirectory stringByAppendingPathComponent:tempFileName]; + + return tempFilePath; +} + ++ (nullable NSString *)writeDataToTemporaryFile:(NSData *)data fileExtension:(NSString *_Nullable)fileExtension +{ + OWSAssertDebug(data); + + NSString *tempFilePath = [self temporaryFilePathWithFileExtension:fileExtension]; + NSError *error; + BOOL success = [data writeToFile:tempFilePath options:NSDataWritingAtomic error:&error]; + if (!success || error) { + OWSFailDebug(@"could not write to temporary file: %@", error); + return nil; + } + + [self protectFileOrFolderAtPath:tempFilePath]; + + return tempFilePath; +} + ++ (nullable NSNumber *)fileSizeOfPath:(NSString *)filePath +{ + NSFileManager *fileManager = [NSFileManager defaultManager]; + NSError *_Nullable error; + unsigned long long fileSize = + [[fileManager attributesOfItemAtPath:filePath error:&error][NSFileSize] unsignedLongLongValue]; + if (error) { + OWSLogError(@"Couldn't fetch file size[%@]: %@", filePath, error); + return nil; + } else { + return @(fileSize); + } +} + +@end + +NS_ASSUME_NONNULL_END diff --git a/SignalCoreKit/src/OWSLogger.h b/SignalCoreKit/src/OWSLogger.h new file mode 100644 index 0000000..c852530 --- /dev/null +++ b/SignalCoreKit/src/OWSLogger.h @@ -0,0 +1,80 @@ +// +// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// + +@import CocoaLumberjack; + +NS_ASSUME_NONNULL_BEGIN + +static inline BOOL ShouldLogVerbose() +{ + return ddLogLevel >= DDLogLevelVerbose; +} + +static inline BOOL ShouldLogDebug() +{ + return ddLogLevel >= DDLogLevelDebug; +} + +static inline BOOL ShouldLogInfo() +{ + return ddLogLevel >= DDLogLevelInfo; +} + +static inline BOOL ShouldLogWarning() +{ + return ddLogLevel >= DDLogLevelWarning; +} + +static inline BOOL ShouldLogError() +{ + return ddLogLevel >= DDLogLevelError; +} + +/** + * A minimal DDLog wrapper for swift. + */ +@interface OWSLogger : NSObject + ++ (void)verbose:(NSString *)logString; ++ (void)debug:(NSString *)logString; ++ (void)info:(NSString *)logString; ++ (void)warn:(NSString *)logString; ++ (void)error:(NSString *)logString; + ++ (void)flush; + +@end + +#define OWSLogPrefix() \ + ([NSString stringWithFormat:@"[%@:%d %s]: ", \ + [[NSString stringWithUTF8String:__FILE__] lastPathComponent], \ + __LINE__, \ + __PRETTY_FUNCTION__]) + +#define OWSLogVerbose(_messageFormat, ...) \ + do { \ + DDLogVerbose(@"%@%@", OWSLogPrefix(), [NSString stringWithFormat:_messageFormat, ##__VA_ARGS__]); \ + } while (0) + +#define OWSLogDebug(_messageFormat, ...) \ + do { \ + DDLogDebug(@"%@%@", OWSLogPrefix(), [NSString stringWithFormat:_messageFormat, ##__VA_ARGS__]); \ + } while (0) + +#define OWSLogInfo(_messageFormat, ...) \ + do { \ + DDLogInfo(@"%@%@", OWSLogPrefix(), [NSString stringWithFormat:_messageFormat, ##__VA_ARGS__]); \ + } while (0) + +#define OWSLogWarn(_messageFormat, ...) \ + do { \ + DDLogWarn(@"%@%@", OWSLogPrefix(), [NSString stringWithFormat:_messageFormat, ##__VA_ARGS__]); \ + } while (0) + +#define OWSLogError(_messageFormat, ...) \ + do { \ + DDLogError(@"%@%@", OWSLogPrefix(), [NSString stringWithFormat:_messageFormat, ##__VA_ARGS__]); \ + } while (0) + +NS_ASSUME_NONNULL_END diff --git a/SignalCoreKit/src/OWSLogger.m b/SignalCoreKit/src/OWSLogger.m new file mode 100644 index 0000000..ae1a484 --- /dev/null +++ b/SignalCoreKit/src/OWSLogger.m @@ -0,0 +1,43 @@ +// +// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// + +#import "OWSLogger.h" + +NS_ASSUME_NONNULL_BEGIN + +@implementation OWSLogger + ++ (void)verbose:(NSString *)logString +{ + DDLogVerbose(@"%@", logString); +} + ++ (void)debug:(NSString *)logString +{ + DDLogDebug(@"%@", logString); +} + ++ (void)info:(NSString *)logString +{ + DDLogInfo(@"%@", logString); +} + ++ (void)warn:(NSString *)logString +{ + DDLogWarn(@"%@", logString); +} + ++ (void)error:(NSString *)logString +{ + DDLogError(@"%@", logString); +} + ++ (void)flush +{ + [DDLog flushLog]; +} + +@end + +NS_ASSUME_NONNULL_END diff --git a/SignalCoreKit/src/OWSSwiftUtils.swift b/SignalCoreKit/src/OWSSwiftUtils.swift new file mode 100644 index 0000000..3b869fb --- /dev/null +++ b/SignalCoreKit/src/OWSSwiftUtils.swift @@ -0,0 +1,59 @@ +// +// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// + +import Foundation + +/** + * We synchronize access to state in this class using this queue. + */ +public func assertOnQueue(_ queue: DispatchQueue) { + if #available(iOS 10.0, *) { + dispatchPrecondition(condition: .onQueue(queue)) + } else { + // Skipping check on Never { + + owsFailDebug(logMessage, file: file, function: function, line: line) + let formattedMessage = owsFormatLogMessage(logMessage, file: file, function: function, line: line) + fatalError(formattedMessage) +} + +// Once we're on Swift4.2 we can mark this as inlineable +// @inlinable +public func notImplemented(file: String = #file, + function: String = #function, + line: Int = #line) -> Never { + owsFail("Method not implemented.", file: file, function: function, line: line) +} + diff --git a/SignalCoreKit/src/Threading.h b/SignalCoreKit/src/Threading.h new file mode 100644 index 0000000..dca1d19 --- /dev/null +++ b/SignalCoreKit/src/Threading.h @@ -0,0 +1,17 @@ +// +// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// + +NS_ASSUME_NONNULL_BEGIN + +// The block is executed immediately if called from the +// main thread; otherwise it is dispatched async to the +// main thread. +void DispatchMainThreadSafe(dispatch_block_t block); + +// The block is executed immediately if called from the +// main thread; otherwise it is dispatched sync to the +// main thread. +void DispatchSyncMainThreadSafe(dispatch_block_t block); + +NS_ASSUME_NONNULL_END diff --git a/SignalCoreKit/src/Threading.m b/SignalCoreKit/src/Threading.m new file mode 100644 index 0000000..a2ea94b --- /dev/null +++ b/SignalCoreKit/src/Threading.m @@ -0,0 +1,35 @@ +// +// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// + +#import "Threading.h" + +NS_ASSUME_NONNULL_BEGIN + +void DispatchMainThreadSafe(dispatch_block_t block) +{ + OWSCAssertDebug(block); + + if ([NSThread isMainThread]) { + block(); + } else { + dispatch_async(dispatch_get_main_queue(), ^{ + block(); + }); + } +} + +void DispatchSyncMainThreadSafe(dispatch_block_t block) +{ + OWSCAssertDebug(block); + + if ([NSThread isMainThread]) { + block(); + } else { + dispatch_sync(dispatch_get_main_queue(), ^{ + block(); + }); + } +} + +NS_ASSUME_NONNULL_END diff --git a/SignalCoreKitTests/Info.plist b/SignalCoreKitTests/Info.plist new file mode 100644 index 0000000..6c40a6c --- /dev/null +++ b/SignalCoreKitTests/Info.plist @@ -0,0 +1,22 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + BNDL + CFBundleShortVersionString + 1.0 + CFBundleVersion + 1 + + diff --git a/SignalCoreKitTests/SignalCoreKitTests.swift b/SignalCoreKitTests/SignalCoreKitTests.swift new file mode 100644 index 0000000..bb554df --- /dev/null +++ b/SignalCoreKitTests/SignalCoreKitTests.swift @@ -0,0 +1,36 @@ +// +// SignalCoreKitTests.swift +// SignalCoreKitTests +// +// Created by matthew on 9/21/18. +// Copyright © 2018 Signal. All rights reserved. +// + +import XCTest +@testable import SignalCoreKit + +class SignalCoreKitTests: XCTestCase { + + override func setUp() { + super.setUp() + // Put setup code here. This method is called before the invocation of each test method in the class. + } + + override func tearDown() { + // Put teardown code here. This method is called after the invocation of each test method in the class. + super.tearDown() + } + + func testExample() { + // This is an example of a functional test case. + // Use XCTAssert and related functions to verify your tests produce the correct results. + } + + func testPerformanceExample() { + // This is an example of a performance test case. + self.measure { + // Put the code you want to measure the time of here. + } + } + +}