Skip to content

Commit

Permalink
Merge in upstream v1.3.5 (#78)
Browse files Browse the repository at this point in the history 
* build(deps-dev): bump eslint from 8.0.1 to 8.15.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.0.1 to 8.15.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](eslint/eslint@v8.0.1...v8.15.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* build(deps-dev): bump eslint from 8.15.0 to 8.19.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.15.0 to 8.19.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](eslint/eslint@v8.15.0...v8.19.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* build(deps): bump xml-crypto from 2.1.3 to 2.1.4

Bumps [xml-crypto](https://github.com/yaronn/xml-crypto) from 2.1.3 to 2.1.4.
- [Release notes](https://github.com/yaronn/xml-crypto/releases)
- [Commits](https://github.com/yaronn/xml-crypto/commits)

---
updated-dependencies:
- dependency-name: xml-crypto
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

* build(deps-dev): bump eslint from 8.19.0 to 8.25.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.19.0 to 8.25.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](eslint/eslint@v8.19.0...v8.25.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* chore(travis): run with node 16 & 18

* chore(travis): run with focal

* build(deps-dev): bump eslint from 8.25.0 to 8.26.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.25.0 to 8.26.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](eslint/eslint@v8.25.0...v8.26.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* build(deps): bump xml-crypto from 2.1.4 to 3.0.1

Bumps [xml-crypto](https://github.com/yaronn/xml-crypto) from 2.1.4 to 3.0.1.
- [Release notes](https://github.com/yaronn/xml-crypto/releases)
- [Commits](node-saml/xml-crypto@v2.1.4...v3.0.1)

---
updated-dependencies:
- dependency-name: xml-crypto
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>

* chore(gh): add github actions

* chore(gh): add codeql

* build(deps): bump json-schema and jsprim

Bumps [json-schema](https://github.com/kriszyp/json-schema) and [jsprim](https://github.com/joyent/node-jsprim). These dependencies needed to be updated together.

Updates `json-schema` from 0.2.3 to 0.4.0
- [Release notes](https://github.com/kriszyp/json-schema/releases)
- [Commits](kriszyp/json-schema@v0.2.3...v0.4.0)

Updates `jsprim` from 1.4.1 to 1.4.2
- [Release notes](https://github.com/joyent/node-jsprim/releases)
- [Changelog](https://github.com/TritonDataCenter/node-jsprim/blob/v1.4.2/CHANGES.md)
- [Commits](TritonDataCenter/node-jsprim@v1.4.1...v1.4.2)

---
updated-dependencies:
- dependency-name: json-schema
  dependency-type: indirect
- dependency-name: jsprim
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>

* chore(ci): remove travis

* build(deps-dev): bump mocha from 9.2.1 to 10.1.0

Bumps [mocha](https://github.com/mochajs/mocha) from 9.2.1 to 10.1.0.
- [Release notes](https://github.com/mochajs/mocha/releases)
- [Changelog](https://github.com/mochajs/mocha/blob/master/CHANGELOG.md)
- [Commits](mochajs/mocha@v9.2.1...v10.1.0)

---
updated-dependencies:
- dependency-name: mocha
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>

* chore(mocha): mocha path

* build(deps): bump @xmldom/xmldom from 0.7.5 to 0.8.5

Bumps [@xmldom/xmldom](https://github.com/xmldom/xmldom) from 0.7.5 to 0.8.5.
- [Release notes](https://github.com/xmldom/xmldom/releases)
- [Changelog](https://github.com/xmldom/xmldom/blob/master/CHANGELOG.md)
- [Commits](xmldom/xmldom@0.7.5...0.8.5)

---
updated-dependencies:
- dependency-name: "@xmldom/xmldom"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* fix(xmldom): spaces changes since @xmldom/[email protected]

* chore: npm audit fix

* fix(amazon2): Incomplete URL substring sanitization

Reported by CodeQL

* chore: bump version to 1.13.4

* fix(amazon2): Incomplete URL substring sanitization

* chore: bump version to 1.12.5

* build(deps-dev): bump eslint from 8.26.0 to 8.27.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.26.0 to 8.27.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](eslint/eslint@v8.26.0...v8.27.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Vincent Giersch <[email protected]>
  • Loading branch information
@varney @dependabot @gierschv
3 people authored Apr 9, 2024
1 parent 1149c34 commit 96334e0
Show file tree
Hide file tree
Showing 7 changed files with 2,330 additions and 2,208 deletions.
74 changes: 74 additions & 0 deletions .github/workflows/codeql.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
# For most projects, this workflow file will not need changing; you simply need
# to commit it to your repository.
#
# You may wish to alter this file to override the set of languages analyzed,
# or to provide custom queries or build logic.
#
# ******** NOTE ********
# We have attempted to detect the languages in your repository. Please check
# the `language` matrix defined below to confirm you have the correct set of
# supported CodeQL languages.
#
name: "CodeQL"

on:
push:
branches: [ "master" ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ "master" ]
schedule:
- cron: '35 12 * * 5'

jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
permissions:
actions: read
contents: read
security-events: write

strategy:
fail-fast: false
matrix:
language: [ 'javascript' ]
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support

steps:
- name: Checkout repository
uses: actions/checkout@v3

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.

# Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
# queries: security-extended,security-and-quality


# Autobuild attempts to build any compiled languages (C/C++, C#, Go, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v2

# ℹ️ Command-line programs to run using the OS shell.
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun

# If the Autobuild fails above, remove it and uncomment the following three lines.
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.

# - run: |
# echo "Run, Build Application using script"
# ./location_of_script_within_repo/buildscript.sh

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
with:
category: "/language:${{matrix.language}}"
7 changes: 3 additions & 4 deletions .github/workflows/nodejs.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [16.x,18.x]
node-version: [16.x, 18.x, 20.x]

steps:
- uses: actions/checkout@v2
Expand All @@ -24,14 +24,13 @@ jobs:
node-version: ${{ matrix.node-version }}

- name: Install dependencies
run: yarn install --frozen-lockfile
run: npm ci
env:
CI: true
NODE_ENV: "test"

- name: Run Tests
shell: 'script -q -e -c "bash {0}"'
run: yarn test
run: npm test
env:
NODE_ENV: "test"
CI: true
2 changes: 1 addition & 1 deletion .npmignore
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
test
logo
.editorconfig
.travis.yml
.github
lint
scripts
30 changes: 15 additions & 15 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,48 +4,48 @@ lint:

.PHONY: test
test:
./node_modules/mocha/bin/_mocha test/apple.js -R spec -b --timeout=5000 --path=false
./node_modules/mocha/bin/_mocha test/google.js -R spec -b --path=false --pk=false
./node_modules/mocha/bin/_mocha test/amazon.js -R spec -b --timeout=5000 --sharedKey=false --path=false
./node_modules/mocha/bin/_mocha test/windows.js -R spec -b --timeout=5000 --path=false
#./node_modules/mocha/bin/_mocha test/facebook.js -R spec -b --timeout=5000 --appAccessToken=false --path=false
npx mocha test/apple.js -R spec -b --timeout=5000 --path=false
npx mocha test/google.js -R spec -b --path=false --pk=false
npx mocha test/amazon.js -R spec -b --timeout=5000 --sharedKey=false --path=false
npx mocha test/windows.js -R spec -b --timeout=5000 --path=false
#npx mocha test/facebook.js -R spec -b --timeout=5000 --appAccessToken=false --path=false

.PHONY: aptest
aptest:
./node_modules/mocha/bin/_mocha test/apple.js -R spec -b --timeout=5000 --path=false
npx mocha test/apple.js -R spec -b --timeout=5000 --path=false

.PHONY: gotest
gotest:
./node_modules/mocha/bin/_mocha test/google.js -R spec -b --path=false --pk=false
npx mocha test/google.js -R spec -b --path=false --pk=false

.PHONY: amtest
amtest:
./node_modules/mocha/bin/_mocha test/amazon.js -R spec -b --timeout=5000 --sharedKey=false --path=false
npx mocha test/amazon.js -R spec -b --timeout=5000 --sharedKey=false --path=false

.PHONY: witest
witest:
./node_modules/mocha/bin/_mocha test/windows.js -R spec -b --timeout=5000 --path=false
npx mocha test/windows.js -R spec -b --timeout=5000 --path=false

.PHONY: fatest
witest:
./node_modules/mocha/bin/_mocha test/facebook.js -R spec -b --timeout=5000 --appAccessToken=false --path=false
npx mocha test/facebook.js -R spec -b --timeout=5000 --appAccessToken=false --path=false

.PHONY: test-apple
test-apple:
./node_modules/mocha/bin/_mocha test/apple.js -R spec -b --timeout=5000 --path=$(path)
npx mocha test/apple.js -R spec -b --timeout=5000 --path=$(path)

.PHONY: test-google
test-google:
./node_modules/mocha/bin/_mocha test/google.js -R spec -b --path=$(path) --pk=$(pk)
npx mocha test/google.js -R spec -b --path=$(path) --pk=$(pk)

.PHONY: test-windows
test-windows:
./node_modules/mocha/bin/_mocha test/windows.js -R spec -b --timeout=5000 --path=$(path)
npx mocha test/windows.js -R spec -b --timeout=5000 --path=$(path)

.PHONY: test-amazon
test-amazon:
./node_modules/mocha/bin/_mocha test/amazon.js -R spec -b --timeout=5000 --sharedKey=$(sharedKey) --path=$(path)
npx mocha test/amazon.js -R spec -b --timeout=5000 --sharedKey=$(sharedKey) --path=$(path)

.PHONY: test-facebook
test-facebook:
./node_modules/mocha/bin/_mocha test/facebook.js -R spec -b --timeout=5000 --appAccessToken=$(appAccessToken) --path=$(path)
npx mocha test/facebook.js -R spec -b --timeout=5000 --appAccessToken=$(appAccessToken) --path=$(path)
2 changes: 1 addition & 1 deletion lib/amazon2.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ module.exports.validatePurchase = function (dSecret, receipt, cb) {
};

function _isSandbox(path) {
return !path.startsWith(VALIDATION_HOST + '/');
return !path.startsWith(`${VALIDATION_HOST}/`);
}

module.exports.getPurchaseData = function (purchase, options) {
Expand Down
Loading

0 comments on commit 96334e0

Please sign in to comment.