prepare 1.1.1 release (#10)

LaunchDarklyReleaseBot · hroederld · bwoskow-ld · web-flow · commit 88897ae46ff3 · 2022-05-31T14:27:10.000-07:00
* fix history, merge in rough evaluation * [ch88982] polling with bridge (#3) * [ch89618] add basic CI to build bridge * Increase testing and expand on handling of error cases. (#6) * Event scaffolding, and basic operators / allFlags (#7) * [ch88983] More event logic (#8) * [ch88983] event summarization (#9) * [ch88983] Add more complete event bundling (#10) * [ch92034] more evaluation operator support (#12) * [ch92034] Add semver operator support (#13) * fix issues to pass wrapper * [ch89623] API documention (#14) * miscellaneous tiny tasks (#15) * do not require key for config * remove commented out try / catch blocks * another location where LDConfig constructor needed to be updated * Add a helper Makefile to assist dev cycle * update Makefile to force push to Salesforce * update LDClient to construct default LDConfig if config is null * [ch94250] limit event queue (#16) * Cleanup bridge implementation (#17) * [ch94716] Use new SDK domain (#19) * Remove RESTWrapper logic (#18) * [ch94746] add constructor to LDClient that uses default LDConfig (#20) * [ch94864] add user agent to bridge #21 * update semver to the format we have used before * add minimal changelog * add beta disclaimer * correct title of Salesforce in README * correct reference to incorrect SDK * update changelog initial warning * Adding the pull request template (#22) * [ch98184] [ch98185] Add JWT auth, add scratch org CI, refactor (#23) * [ch98838] bump http timeout to 30 seconds and make configurable #24 * [ch98980] releaser config for beta 2 (#25) * Removed the guides link * [ch99747] Add alias support (#26) * [ch110766] Fix bucketBy behavior when attribute does not exist * remove beta warning (#27) * [ch108417] experimentation allocation (#29) * Updates docs URLs * Guard against invalid PEM decoding of OAUTH_JWT_KEY The return value of pem.Decode must be checked, as it can be nil if decoding fails. This previously caused a panic; now it should return an error. * Clarify error messages related to private key decoding * Add gitignore * Rename master->main in PR template * Bump circleci/salesforce-sfdx to 2.2.0 Co-authored-by: Harpo Roeder <hroeder@launchdarkly.com> Co-authored-by: Ben Woskow <48036130+bwoskow-ld@users.noreply.github.com> Co-authored-by: Ben Woskow <bwoskow@launchdarkly.com> Co-authored-by: LaunchDarklyCI <dev@launchdarkly.com> Co-authored-by: LaunchDarklyReleaseBot <launchdarklyreleasebot@launchdarkly.com> Co-authored-by: Ember Stevens <ember.stevens@launchdarkly.com> Co-authored-by: ember-stevens <79482775+ember-stevens@users.noreply.github.com> Co-authored-by: Casey Waldren <cwaldren@launchdarkly.com>
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,7 +1,7 @@
 version: 2.1
 
 orbs:
-  sfdx: circleci/salesforce-sfdx@2.1.0
+  sfdx: circleci/salesforce-sfdx@2.2.0
 
 workflows:
   version: 2
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -1,7 +1,7 @@
 **Requirements**
 
 - [ ] I have added test coverage for new or changed functionality
-- [ ] I have followed the repository's [pull request submission guidelines](../blob/master/CONTRIBUTING.md#submitting-pull-requests)
+- [ ] I have followed the repository's [pull request submission guidelines](../blob/main/CONTRIBUTING.md#submitting-pull-requests)
 - [ ] I have validated my changes against all supported platform versions
 
 **Related issues**
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+.idea/
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,6 +1,6 @@
 # Contributing to the LaunchDarkly Server-Side SDK for Apex
 
-LaunchDarkly has published an [SDK contributor's guide](https://docs.launchdarkly.com/docs/sdk-contributors-guide) that provides a detailed explanation of how our SDKs work. See below for additional information on how to contribute to this SDK.
+LaunchDarkly has published an [SDK contributor's guide](https://docs.launchdarkly.com/sdk/concepts/contributors-guide) that provides a detailed explanation of how our SDKs work. See below for additional information on how to contribute to this SDK.
 
 ## Submitting bug reports and feature requests
 
diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ Download a release archive from the [GitHub Releases](https://github.com/launchd
 
 ## Learn more
 
-Check out our [documentation](https://docs.launchdarkly.com) for in-depth instructions on configuring and using LaunchDarkly. You can also head straight to the [complete reference guide for this SDK](https://docs.launchdarkly.com/sdk/server-side/apex).
+Read our [documentation](https://docs.launchdarkly.com) for in-depth instructions on configuring and using LaunchDarkly. You can also head straight to the [complete reference guide for this SDK](https://docs.launchdarkly.com/sdk/server-side/apex).
 
 ## Testing
 
@@ -25,7 +25,7 @@ We encourage pull requests and other contributions from the community. Check out
     * Gradually roll out a feature to an increasing percentage of users, and track the effect that the feature has on key metrics (for instance, how likely is a user to complete a purchase if they have feature A versus feature B?).
     * Turn off a feature that you realize is causing performance problems in production, without needing to re-deploy, or even restart the application with a changed configuration file.
     * Grant access to certain features based on user attributes, like payment plan (eg: users on the ‘gold’ plan get access to more features than users in the ‘silver’ plan). Disable parts of your application to facilitate maintenance, without taking everything offline.
-* LaunchDarkly provides feature flag SDKs for a wide variety of languages and technologies. Check out [our documentation](https://docs.launchdarkly.com/docs) for a complete list.
+* LaunchDarkly provides feature flag SDKs for a wide variety of languages and technologies. Read [our documentation](https://docs.launchdarkly.com/sdk) for a complete list.
 * Explore LaunchDarkly
     * [launchdarkly.com](https://www.launchdarkly.com/ "LaunchDarkly Main Website") for more information
     * [docs.launchdarkly.com](https://docs.launchdarkly.com/  "LaunchDarkly Documentation") for our documentation and SDK reference guides
diff --git a/bridge/main.go b/bridge/main.go
@@ -103,15 +103,18 @@ func newBridge() (*Bridge, error) {
 	} else {
 		decodedString, err := base64.StdEncoding.DecodeString(oauthJWTKey)
 		if err != nil {
-			return nil, errors.New("OAUTH_JWT_KEY base64 decode failed")
+			return nil, errors.New("OAUTH_JWT_KEY is not valid standard-encoding base64")
+		}
+		pem, _ := pem.Decode(decodedString)
+		if pem == nil {
+			return nil, errors.New("OAUTH_JWT_KEY is not a valid PEM-encoded block")
 		}
-		pem, _ := pem.Decode([]byte(decodedString))
 		if pem.Type != "RSA PRIVATE KEY" {
-			return nil, errors.New("OAUTH_JWT_KEY PEM expected RSA PRIVATE KEY failed")
+			return nil, errors.New("OAUTH_JWT_KEY PEM block must be called 'RSA PRIVATE KEY'")
 		}
 		decodedX509, err := x509.ParsePKCS1PrivateKey(pem.Bytes)
 		if err != nil {
-			return nil, errors.New("OAUTH_JWT_KEY x509 decode failed")
+			return nil, errors.New("OAUTH_JWT_KEY failed to decode PKCS1 private key from PEM bytes")
 		}
 		bridge.oauthJWTKey = decodedX509
 	}

Original file line number	Diff line number	Diff line change
`@@ -103,15 +103,18 @@ func newBridge() (*Bridge, error) {`
`103`	`103`	`} else {`
`104`	`104`	`decodedString, err := base64.StdEncoding.DecodeString(oauthJWTKey)`
`105`	`105`	`if err != nil {`
`106`		`- return nil, errors.New("OAUTH_JWT_KEY base64 decode failed")`
	`106`	`+ return nil, errors.New("OAUTH_JWT_KEY is not valid standard-encoding base64")`
	`107`	`+ }`
	`108`	`+ pem, _ := pem.Decode(decodedString)`
	`109`	`+ if pem == nil {`
	`110`	`+ return nil, errors.New("OAUTH_JWT_KEY is not a valid PEM-encoded block")`
`107`	`111`	`}`
`108`		`- pem, _ := pem.Decode([]byte(decodedString))`
`109`	`112`	`if pem.Type != "RSA PRIVATE KEY" {`
`110`		`- return nil, errors.New("OAUTH_JWT_KEY PEM expected RSA PRIVATE KEY failed")`
	`113`	`+ return nil, errors.New("OAUTH_JWT_KEY PEM block must be called 'RSA PRIVATE KEY'")`
`111`	`114`	`}`
`112`	`115`	`decodedX509, err := x509.ParsePKCS1PrivateKey(pem.Bytes)`
`113`	`116`	`if err != nil {`
`114`		`- return nil, errors.New("OAUTH_JWT_KEY x509 decode failed")`
	`117`	`+ return nil, errors.New("OAUTH_JWT_KEY failed to decode PKCS1 private key from PEM bytes")`
`115`	`118`	`}`
`116`	`119`	`bridge.oauthJWTKey = decodedX509`
`117`	`120`	`}`