1
0
Fork 0

Fix Foxx queue registration (#3089)

Multiple registration of the same queue was possible. The queue document in _queue was saved multiple times with the same key/id
This commit is contained in:
Mark 2017-08-22 10:38:46 +02:00 committed by Frank Celler
parent 6ec93df784
commit 16f2788b6b
2 changed files with 110 additions and 23 deletions

View File

@ -698,8 +698,7 @@ static void JS_CreateQueue(v8::FunctionCallbackInfo<v8::Value> const& args) {
auto transactionContext = std::make_shared<transaction::V8Context>(v8g->_vocbase, true); auto transactionContext = std::make_shared<transaction::V8Context>(v8g->_vocbase, true);
SingleCollectionTransaction trx(transactionContext, "_queues", SingleCollectionTransaction trx(transactionContext, "_queues",
AccessMode::Type::WRITE); AccessMode::Type::EXCLUSIVE);
trx.addHint(transaction::Hints::Hint::SINGLE_OPERATION);
Result res = trx.begin(); Result res = trx.begin();
if (!res.ok()) { if (!res.ok()) {
TRI_V8_THROW_EXCEPTION(res); TRI_V8_THROW_EXCEPTION(res);

View File

@ -0,0 +1,88 @@
/* jshint globalstrict:true, strict:true, maxlen: 5000 */
/* global describe, before, afterEach, it, require*/
// //////////////////////////////////////////////////////////////////////////////
// / @brief tests for user access rights
// /
// / @file
// /
// / DISCLAIMER
// /
// / Copyright 2017 ArangoDB GmbH, Cologne, Germany
// /
// / Licensed under the Apache License, Version 2.0 (the "License");
// / you may not use this file except in compliance with the License.
// / You may obtain a copy of the License at
// /
// / http://www.apache.org/licenses/LICENSE-2.0
// /
// / Unless required by applicable law or agreed to in writing, software
// / distributed under the License is distributed on an "AS IS" BASIS,
// / WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// / See the License for the specific language governing permissions and
// / limitations under the License.
// /
// / Copyright holder is ArangoDB GmbH, Cologne, Germany
// /
// / @author Mark Vollmary
// / @author Copyright 2017, ArangoDB GmbH, Cologne, Germany
// //////////////////////////////////////////////////////////////////////////////
'use strict';
const expect = require('chai').expect;
const foxxManager = require('@arangodb/foxx/manager');
const fs = require('fs');
const basePath = fs.makeAbsolute(fs.join(require('internal').startupPath, 'common', 'test-data', 'apps'));
const download = require('internal').download;
const arangodb = require('@arangodb');
const arango = require('@arangodb').arango;
const aql = arangodb.aql;
const db = require('internal').db;
describe('Foxx service', () => {
const mount = '/queue_test_mount';
before(() => {
foxxManager.install(fs.join(basePath, 'queue'), mount);
});
afterEach(() => {
download(`${arango.getEndpoint().replace('tcp://', 'http://')}/${mount}`, '', {
method: 'delete'
});
});
it('should support queue registration', () => {
const queuesBefore = db._query(aql`
FOR queue IN _queues
RETURN queue
`).toArray();
const res = download(`${arango.getEndpoint().replace('tcp://', 'http://')}/${mount}`, '', {
method: 'post'
});
expect(res.code).to.equal(204);
const queuesAfter = db._query(aql`
FOR queue IN _queues
RETURN queue
`).toArray();
expect(queuesAfter.length - queuesBefore.length).to.equal(1, 'Could not register foxx queue');
});
it('should not register a queue two times', () => {
const queuesBefore = db._query(aql`
FOR queue IN _queues
RETURN queue
`).toArray();
let res = download(`${arango.getEndpoint().replace('tcp://', 'http://')}/${mount}`, '', {
method: 'post'
});
expect(res.code).to.equal(204);
res = download(`${arango.getEndpoint().replace('tcp://', 'http://')}/${mount}`, '', {
method: 'post'
});
expect(res.code).to.equal(204);
const queuesAfter = db._query(aql`
FOR queue IN _queues
RETURN queue
`).toArray();
expect(queuesAfter.length - queuesBefore.length).to.equal(1);
});
});