Skip to content

Commit

Permalink
Merge pull request #8 from gotthardp/lrb-gh-7
Browse files Browse the repository at this point in the history
PR #7 with updates
  • Loading branch information
lukebakken committed Aug 1, 2018
2 parents 785c276 + 94e4d81 commit 4406191
Show file tree
Hide file tree
Showing 15 changed files with 1,677 additions and 1,127 deletions.
19 changes: 11 additions & 8 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
.sw?
.*.sw?
*.beam
/.erlang.mk/
/cover/
/deps/
/doc/
/ebin/
/logs/
/plugins/
.erlang.mk/
cover/
deps/
doc/
ebin/
logs/
plugins/
.vagrant

/rabbitmq_auth_backend_ip_range.d
test/config_schema_SUITE_data/schema/

rabbitmq_auth_backend_ip_range.d
20 changes: 13 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,21 @@
language: erlang
# vim:sw=2:et:

language: generic

addons:
apt:
sources:
- sourceline: deb https://packages.erlang-solutions.com/ubuntu trusty contrib
key_url: https://packages.erlang-solutions.com/ubuntu/erlang_solutions.asc
packages:
- xsltproc
- python3
- esl-erlang
- elixir

otp_release:
- R16B03-1
- 17.5
- 18.0
before_script:
# Make sure we use Elixir from Erlang Solutions and not kiex.
- |
echo YES | kiex implode
elixir --version
script: make tests

Expand Down
23 changes: 12 additions & 11 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,9 +1,20 @@
PROJECT = rabbitmq_auth_backend_ip_range
PROJECT_DESCRIPTION = RabbitMQ IP Range Authentication Backend

define PROJECT_ENV
[
{tag_masks, [{'ip-private', [<<"::FFFF:192.168.0.0/112">>]}]},
{default_masks, [<<"::0/0">>]}
]
endef

DEPS = amqp_client

TEST_DEPS = rabbit
LOCAL_DEPS = inets
DEPS = rabbit_common rabbit amqp_client
TEST_DEPS = rabbitmq_ct_helpers rabbitmq_ct_client_helpers

DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk
DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk

# FIXME: Use erlang.mk patched for RabbitMQ, while waiting for PRs to be
Expand All @@ -14,13 +25,3 @@ ERLANG_MK_COMMIT = rabbitmq-tmp

include rabbitmq-components.mk
include erlang.mk

# --------------------------------------------------------------------
# Testing.
# --------------------------------------------------------------------

WITH_BROKER_SETUP_SCRIPTS := $(CURDIR)/test/setup-rabbit-test.sh
WITH_BROKER_TEST_MAKEVARS := \
RABBITMQ_CONFIG_FILE=$(CURDIR)/test/rabbit-test
WITH_BROKER_TEST_COMMANDS := \
eunit:test(rabbit_auth_tests,[verbose,{report,{eunit_surefire,[{dir,\"test\"}]}}])
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# RabbitMQ plug-in for client authorization based on source IP address

[![Build Status](https://travis-ci.org/gotthardp/rabbitmq-auth-backend-ip-range.svg?branch=master)](https://travis-ci.org/gotthardp/rabbitmq-auth-backend-ip-range)

## Configuration

You need to modify the
Expand Down Expand Up @@ -101,6 +103,7 @@ This plug-in requires RabbitMQ 3.6.0, or higher. Build the plug-in following the
standard [Plugin Development Guide](https://www.rabbitmq.com/plugin-development.html).

## History
* 3.7.0 (August 1, 2018). Compatible with RabbitMQ 3.7.x.
* 0.2.0 (Dec 22, 2015). Compatible with RabbitMQ 3.6.x.
* Implement RabbitMQ [Issue 109](https://github.com/rabbitmq/rabbitmq-server/issues/109)
fix for authorization of MQTT/STOMP connections.
Expand Down
43 changes: 0 additions & 43 deletions build.config

This file was deleted.

Loading

0 comments on commit 4406191

Please sign in to comment.