From 196678c3ca17b26fe5aa653b047a54a7198e5dfe Mon Sep 17 00:00:00 2001 From: quoid Date: Thu, 17 Sep 2020 14:44:53 -0400 Subject: [PATCH 1/3] hotfix for #75 --- extension/Userscripts Extension/UserscriptsSafari.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extension/Userscripts Extension/UserscriptsSafari.js b/extension/Userscripts Extension/UserscriptsSafari.js index 6b921b56..0527f76c 100644 --- a/extension/Userscripts Extension/UserscriptsSafari.js +++ b/extension/Userscripts Extension/UserscriptsSafari.js @@ -12,7 +12,7 @@ if (window.top === window) { const src = e.sourceFile.toUpperCase(); const ext = safari.extension.baseURI.toUpperCase(); // ensure that violation came from the extension - if (ext.startsWith(src)) { + if ((ext.startsWith(src) || src.startsWith(ext))) { // determine what kind of violation if (e.effectiveDirective === "script-src" && evalJS != 1) { inject("eval"); From 0af5112d9ee4393262fee5bc04b7611931c1d228 Mon Sep 17 00:00:00 2001 From: quoid Date: Thu, 17 Sep 2020 14:45:21 -0400 Subject: [PATCH 2/3] update build/version numbers for v2.1.3 --- CHANGELOG.md | 3 +++ .../Userscripts.xcodeproj/project.pbxproj | 20 ++++++++++--------- .../xcschemes/Userscripts Extension.xcscheme | 2 +- .../xcschemes/Userscripts.xcscheme | 2 +- index.html | 2 +- src/js/dev.js | 2 +- 6 files changed, 18 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 09e81463..c16f7c21 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Changelog +## v2.1.3 (TBD) +- fix strict csp fallback method bug caused by safari 14 update #75 + ## v2.1.2 (2020-09-16) - fixed a bug that caused discard & save buttons to remain active after loading a new script - update styling code diff --git a/extension/Userscripts.xcodeproj/project.pbxproj b/extension/Userscripts.xcodeproj/project.pbxproj index bb00442f..971774d9 100644 --- a/extension/Userscripts.xcodeproj/project.pbxproj +++ b/extension/Userscripts.xcodeproj/project.pbxproj @@ -187,7 +187,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 1020; - LastUpgradeCheck = 1160; + LastUpgradeCheck = 1200; ORGANIZATIONNAME = "Justin Wasack"; TargetAttributes = { 4A57B9EB227235CD008A9763 = { @@ -314,6 +314,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -375,6 +376,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -409,7 +411,7 @@ CODE_SIGN_ENTITLEMENTS = "Userscripts Extension/Userscripts Extension.entitlements"; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 19; + CURRENT_PROJECT_VERSION = 20; DEVELOPMENT_TEAM = J74Q8V8V8N; ENABLE_HARDENED_RUNTIME = YES; INFOPLIST_FILE = "Userscripts Extension/Info.plist"; @@ -418,7 +420,7 @@ "@executable_path/../Frameworks", "@executable_path/../../../../Frameworks", ); - MARKETING_VERSION = 2.1.2; + MARKETING_VERSION = 2.1.3; PRODUCT_BUNDLE_IDENTIFIER = "com.userscripts.macos.Userscripts-Extension"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -432,7 +434,7 @@ CODE_SIGN_ENTITLEMENTS = "Userscripts Extension/Userscripts Extension.entitlements"; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 19; + CURRENT_PROJECT_VERSION = 20; DEVELOPMENT_TEAM = J74Q8V8V8N; ENABLE_HARDENED_RUNTIME = YES; INFOPLIST_FILE = "Userscripts Extension/Info.plist"; @@ -441,7 +443,7 @@ "@executable_path/../Frameworks", "@executable_path/../../../../Frameworks", ); - MARKETING_VERSION = 2.1.2; + MARKETING_VERSION = 2.1.3; PRODUCT_BUNDLE_IDENTIFIER = "com.userscripts.macos.Userscripts-Extension"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -458,7 +460,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 19; + CURRENT_PROJECT_VERSION = 20; DEVELOPMENT_TEAM = J74Q8V8V8N; ENABLE_HARDENED_RUNTIME = YES; INFOPLIST_FILE = Userscripts/Info.plist; @@ -466,7 +468,7 @@ "$(inherited)", "@executable_path/../Frameworks", ); - MARKETING_VERSION = 2.1.2; + MARKETING_VERSION = 2.1.3; PRODUCT_BUNDLE_IDENTIFIER = com.userscripts.macos; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; @@ -482,7 +484,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 19; + CURRENT_PROJECT_VERSION = 20; DEVELOPMENT_TEAM = J74Q8V8V8N; ENABLE_HARDENED_RUNTIME = YES; INFOPLIST_FILE = Userscripts/Info.plist; @@ -490,7 +492,7 @@ "$(inherited)", "@executable_path/../Frameworks", ); - MARKETING_VERSION = 2.1.2; + MARKETING_VERSION = 2.1.3; PRODUCT_BUNDLE_IDENTIFIER = com.userscripts.macos; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; diff --git a/extension/Userscripts.xcodeproj/xcshareddata/xcschemes/Userscripts Extension.xcscheme b/extension/Userscripts.xcodeproj/xcshareddata/xcschemes/Userscripts Extension.xcscheme index e10116aa..ce5e3277 100644 --- a/extension/Userscripts.xcodeproj/xcshareddata/xcschemes/Userscripts Extension.xcscheme +++ b/extension/Userscripts.xcodeproj/xcshareddata/xcschemes/Userscripts Extension.xcscheme @@ -1,6 +1,6 @@ --> - \ No newline at end of file + \ No newline at end of file diff --git a/src/js/dev.js b/src/js/dev.js index 962d82eb..ec311f7b 100644 --- a/src/js/dev.js +++ b/src/js/dev.js @@ -195,7 +195,7 @@ const ___settings = { showInvisibles: "true", tabSize: "4", verbose: "true", - version: "2.1.2" + version: "2.1.3" }; const ___parse = { From 366b36e1735e2eb6af2ace5aad298e42b3952a65 Mon Sep 17 00:00:00 2001 From: quoid Date: Thu, 17 Sep 2020 21:14:04 -0400 Subject: [PATCH 3/3] update changelog date for v2.1.3 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c16f7c21..18f3f493 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## v2.1.3 (TBD) +## v2.1.3 (2020-09-17) - fix strict csp fallback method bug caused by safari 14 update #75 ## v2.1.2 (2020-09-16)