juice-shop-ctf-cli - npm Package Compare versions

Comparing version 3.0.0 to 3.1.0

bin/juice-shop-ctf.js

@@ -0,0 +0,0 @@ #!/usr/bin/env node

CONTRIBUTING.md

@@ -1,2 +0,2 @@
-# Contributing [![GitHub contributors](https://img.shields.io/github/contributors/bkimminich/juice-shop-ctf.svg)](https://github.com/bkimminich/juice-shop-ctf/graphs/contributors) [![Stories in Ready](https://badge.waffle.io/bkimminich/juice-shop-ctf.svg?label=ready&title=Ready)](http://waffle.io/bkimminich/juice-shop-ctf)
+# Contributing [![GitHub contributors](https://img.shields.io/github/contributors/bkimminich/juice-shop-ctf.svg)](https://github.com/bkimminich/juice-shop-ctf/graphs/contributors) [![Stories in Ready](https://badge.waffle.io/bkimminich/juice-shop.svg?label=ready&title=Ready)](http://waffle.io/bkimminich/juice-shop)
 
@@ -3,0 +3,0 @@ [![Build Status](https://travis-ci.org/bkimminich/juice-shop-ctf.svg?branch=master)](https://travis-ci.org/bkimminich/juice-shop-ctf)

index.js

@@ -41,3 +41,3 @@ 'use strict'
   console.log()
-  console.log('Generate ZIP-archive to import into ' + 'CTFd'.bold + ' (>=1.0.5) with the ' + 'OWASP Juice Shop'.bold + ' challenges')
+  console.log('Generate ZIP-archive to import into ' + 'CTFd'.bold + ' (≥1.0.5) with the ' + 'OWASP Juice Shop'.bold + ' challenges')
   inquirer.prompt(questions).then(function (answers) {
@@ -44,0 +44,0 @@ console.log()

lib/calculateHintCost.js

@@ -0,0 +0,0 @@ 'use strict'

lib/calculateScore.js

@@ -0,0 +0,0 @@ 'use strict'

lib/fetchChallenges.js

@@ -0,0 +0,0 @@ 'use strict'

lib/generateData.js

@@ -30,3 +30,4 @@ 'use strict'
         'chal': challenge.id,
-        'key_type': 'static',
+        'key_type': 'static', // TODO Remove deprecated predecessor (from CTFd 1.0.5) of `type` with v4.0.0 release
+        'type': 'static',
         'flag': hmacSha1(ctfKey, challenge.name),
@@ -33,0 +34,0 @@ 'data': null

lib/hmac.js

@@ -0,0 +0,0 @@ 'use strict'

lib/options.js

@@ -0,0 +0,0 @@ 'use strict'

lib/secretKey.js

@@ -0,0 +0,0 @@ 'use strict'

lib/url.js

@@ -0,0 +0,0 @@ 'use strict'

lib/writeToZipFile.js

@@ -0,0 +0,0 @@ 'use strict'

package.json

 {
   "name": "juice-shop-ctf-cli",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "description": "Command line client to generate INSERT statements for CTFd with the OWASP Juice Shop challenges",
@@ -34,3 +34,3 @@ "author": "Bjoern Kimminich <[e-mail]> (https://www.owasp.org/index.php/User:Bjoern_Kimminich)",
   },
-  "homepage": "https://www.owasp.org/index.php/OWASP_Juice_Shop_Project",
+  "homepage": "http://owasp-juice.shop",
   "license": "MIT",
@@ -67,2 +67,3 @@ "main": "index.js",
     "chai-spies": "~0",
+    "chai-subset": "^1.6.0",
     "coveralls": "~2",
@@ -69,0 +70,0 @@ "inquirer-test": "~1",

README.md

@@ -15,3 +15,3 @@ # ![Juice Shop CTF Logo](https://raw.githubusercontent.com/bkimminich/juice-shop-ctf/master/images/JuiceShopCTF_Logo_100px.png) OWASP Juice Shop CTF [![OWASP Labs](https://img.shields.io/badge/owasp-lab%20project-f7b73c.svg)](https://www.owasp.org/index.php/OWASP_Project_Inventory#tab=Labs_Projects) [![GitHub release](https://img.shields.io/github/release/bkimminich/juice-shop-ctf.svg)](https://github.com/bkimminich/juice-shop-ctf/releases/latest) [![Twitter Follow](https://img.shields.io/twitter/follow/owasp_juiceshop.svg?style=social&label=Follow)](https://twitter.com/owasp_juiceshop)
 event against
-[OWASP Juice Shop](https://www.owasp.org/index.php/OWASP_Juice_Shop_Project).
+[OWASP Juice Shop](http://owasp-juice.shop).
 
@@ -22,3 +22,3 @@ ![CLI in action](https://raw.githubusercontent.com/bkimminich/juice-shop-ctf/master/images/juice-shop-ctf-cli.animated.gif)
 > has been tested for schema-compatibility with
-> [CTFd `v1.0.5`](https://github.com/CTFd/CTFd/releases/tag/1.0.5).
+> [CTFd `≥v1.0.5`](https://github.com/CTFd/CTFd/releases/tag/1.0.5).
 
@@ -63,3 +63,3 @@ ## Setup [![npm](https://img.shields.io/npm/dm/juice-shop-ctf-cli.svg)](https://www.npmjs.com/package/juice-shop-ctf-cli) [![npm](https://img.shields.io/npm/dt/juice-shop-ctf-cli.svg)](https://www.npmjs.com/package/juice-shop-ctf-cli)
 
-## Contributing [![GitHub contributors](https://img.shields.io/github/contributors/bkimminich/juice-shop-ctf.svg)](https://github.com/bkimminich/juice-shop-ctf/graphs/contributors) [![Stories in Ready](https://badge.waffle.io/bkimminich/juice-shop-ctf.svg?label=ready&title=Ready)](http://waffle.io/bkimminich/juice-shop-ctf)
+## Contributing [![GitHub contributors](https://img.shields.io/github/contributors/bkimminich/juice-shop-ctf.svg)](https://github.com/bkimminich/juice-shop-ctf/graphs/contributors) [![Stories in Ready](https://badge.waffle.io/bkimminich/juice-shop.svg?label=ready&title=Ready)](http://waffle.io/bkimminich/juice-shop)
 
@@ -95,7 +95,14 @@ Found a bug? Got an idea for enhancement? Improvement for cheating
 
-Ordered by date of first contribution.
-[Auto-generated](https://github.com/dtrejo/node-authors) on Wed, 01 Feb
-2017 20:01:35 GMT.
+### Collaborators
 
 - [Björn Kimminich](https://github.com/bkimminich) aka `bkimminich`
+  (Project Leader)
+- [Jannik Hollenbach](https://github.com/J12934) aka `J12934`
+- [Timo Pagel](https://github.com/wurstbrot) aka `wurstbrot`
+
+### Code Contributors
+
+Based on [GitHub](https://github.com/bkimminich/juice-shop-ctf) commits.
+Ordered by added lines of code as of Mon, 11 Dec 2017 on `master`.
+
 - [Josh Grossman](https://github.com/tghosth) aka `tghosth`
@@ -102,0 +109,0 @@

stryker.conf.js

@@ -0,0 +0,0 @@ // stryker.conf.js

test/e2e/juiceShopCtfCli-spec.js

@@ -0,0 +0,0 @@ var chai = require('chai')

test/unit/calculateHintCost-spec.js

@@ -0,0 +0,0 @@ var chai = require('chai')

test/unit/calculateScore-spec.js

@@ -0,0 +0,0 @@ var chai = require('chai')

test/unit/fetchChallenges-spec.js

@@ -0,0 +0,0 @@ var Promise = require('bluebird')

test/unit/generateData-spec.js

 var Promise = require('bluebird')
 var chai = require('chai')
 chai.use(require('chai-things'))
+chai.use(require('chai-subset'))
 chai.use(require('chai-as-promised'))
@@ -41,7 +42,7 @@ var expect = chai.expect
           results: [
-            { id: 1, chal: 1, flag: '958c64658383140e7d08d5dee091009cc0eafc1f', key_type: 'static', data: null },
-            { id: 2, chal: 2, flag: '49294e8b829f5b053f748facad22825ccb4bf420', key_type: 'static', data: null },
-            { id: 3, chal: 3, flag: 'aae3acb6eff2000c0e12af0d0d875d0bdbf4ca81', key_type: 'static', data: null },
-            { id: 4, chal: 4, flag: '4e2b98db86cc32c56cba287db411198534af4ab6', key_type: 'static', data: null },
-            { id: 5, chal: 5, flag: '554df67c6c0b6a99efecaec4fe2ced73b7b5be60', key_type: 'static', data: null }
+            { id: 1, chal: 1, flag: '958c64658383140e7d08d5dee091009cc0eafc1f', type: 'static', key_type: 'static', data: null },
+            { id: 2, chal: 2, flag: '49294e8b829f5b053f748facad22825ccb4bf420', type: 'static', key_type: 'static', data: null },
+            { id: 3, chal: 3, flag: 'aae3acb6eff2000c0e12af0d0d875d0bdbf4ca81', type: 'static', key_type: 'static', data: null },
+            { id: 4, chal: 4, flag: '4e2b98db86cc32c56cba287db411198534af4ab6', type: 'static', key_type: 'static', data: null },
+            { id: 5, chal: 5, flag: '554df67c6c0b6a99efecaec4fe2ced73b7b5be60', type: 'static', key_type: 'static', data: null }
           ]
@@ -52,2 +53,28 @@ }
 
+  xit('should consist of one object pushed into flagKeys.results per challenge', function () {
+    return expect(generateData(challenges, options.noTextHints, options.noHintUrls, '')).to.eventually.deep.containSubset(
+      {
+        flagKeys: {
+          results: [
+            { id: 1, chal: 1, flag: '958c64658383140e7d08d5dee091009cc0eafc1f', type: 'static', data: null },
+            { id: 2, chal: 2, flag: '49294e8b829f5b053f748facad22825ccb4bf420', type: 'static', data: null },
+            { id: 3, chal: 3, flag: 'aae3acb6eff2000c0e12af0d0d875d0bdbf4ca81', type: 'static', data: null },
+            { id: 4, chal: 4, flag: '4e2b98db86cc32c56cba287db411198534af4ab6', type: 'static', data: null },
+            { id: 5, chal: 5, flag: '554df67c6c0b6a99efecaec4fe2ced73b7b5be60', type: 'static', data: null }
+          ]
+        }
+      })
+  })
+
+  xit('should contain the "key_type" property for backward compatibility with CTFd <1.1.0', function () {
+    return expect(generateData(challenges, options.noTextHints, options.noHintUrls, '')).to.eventually.deep.containSubset(
+      {
+        flagKeys: {
+          results: [
+            { key_type: 'static' }
+          ]
+        }
+      })
+  })
+
   it('should be empty when given no challenges', function () {
@@ -54,0 +81,0 @@ return expect(generateData({}, options.noTextHints, options.noHintUrls, '')).to.eventually.deep.include(

test/unit/hmac-spec.js

@@ -0,0 +0,0 @@ var chai = require('chai')

test/unit/secretKey-spec.js

@@ -0,0 +0,0 @@ var Promise = require('bluebird')

test/unit/url-spec.js

@@ -0,0 +0,0 @@ var chai = require('chai')

test/unit/writeToZipFile-spec.js

@@ -0,0 +0,0 @@ var Promise = require('bluebird')

No alert changes

Improved metrics

Total package byte prevSize

769190

increased by0.36%

Lines of code

742

increased by3.63%

Number of lines in readme file

113

increased by6.6%

Worsened metrics

Dev dependency count

16

increased by6.67%

No dependency changes