github
/
mosquitto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move basic auth to own file.

Browse Source
pull/2438/head
Roger A. Light 4 years ago
parent 96ba8f6a47
commit f5baeac976
4 changed files with 122 additions and 90 deletions
Show Stats Download Patch File Download Diff File

2
src/CMakeLists.txt
Unescape Escape View File

@ -44,7 +44,7 @@ set (MOSQ_SRCS
persist_write_v5.c persist_write.c
persist.h
plugin.c plugin_v4.c plugin_v3.c plugin_v2.c
plugin_connect.c plugin_disconnect.c plugin_extended_auth.c plugin_message.c
plugin_basic_auth.c plugin_connect.c plugin_disconnect.c plugin_extended_auth.c plugin_message.c
plugin_psk_key.c plugin_public.c plugin_tick.c
property_broker.c
../lib/property_mosq.c ../lib/property_mosq.h

4
src/Makefile
Unescape Escape View File

@ -59,6 +59,7 @@ OBJS= mosquitto.o \
plugin_v2.o \
plugin_v3.o \
plugin_v4.o \
plugin_basic_auth.o \
plugin_connect.o \
plugin_disconnect.o \
plugin_extended_auth.o \
@ -272,6 +273,9 @@ plugin_v3.o : plugin_v3.c ../include/mosquitto_plugin.h mosquitto_broker_interna
plugin_v4.o : plugin_v4.c ../include/mosquitto_plugin.h mosquitto_broker_internal.h
${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@
plugin_basic_auth.o : plugin_basic_auth.c ../include/mosquitto_plugin.h mosquitto_broker_internal.h
${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@
plugin_connect.o : plugin_connect.c ../include/mosquitto_plugin.h mosquitto_broker_internal.h
${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@

117
src/plugin_basic_auth.c
Unescape Escape View File

@ -0,0 +1,117 @@
/*
Copyright (c) 2011-2021 Roger Light <roger@atchoo.org>
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License 2.0
and Eclipse Distribution License v1.0 which accompany this distribution.
The Eclipse Public License is available at
https://www.eclipse.org/legal/epl-2.0/
and the Eclipse Distribution License is available at
http://www.eclipse.org/org/documents/edl-v10.php.
SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
Contributors:
Roger Light - initial implementation and documentation.
*/
#include "config.h"
#include <stdio.h>
#include <string.h>
#include "mosquitto_broker.h"
#include "mosquitto_broker_internal.h"
#include "mosquitto_plugin.h"
#include "memory_mosq.h"
#include "lib_load.h"
#include "utlist.h"
static int plugin__unpwd_check(struct mosquitto__security_options *opts, struct mosquitto *context)
{
struct mosquitto_evt_basic_auth event_data;
struct mosquitto__callback *cb_base;
int rc;
int rc_final = MOSQ_ERR_PLUGIN_IGNORE;
DL_FOREACH(opts->plugin_callbacks.basic_auth, cb_base){
memset(&event_data, 0, sizeof(event_data));
event_data.client = context;
event_data.username = context->username;
event_data.password = context->password;
rc = cb_base->cb(MOSQ_EVT_BASIC_AUTH, &event_data, cb_base->userdata);
if(rc == MOSQ_ERR_PLUGIN_IGNORE){
/* Do nothing, this is as if the plugin doesn't exist */
}else if(rc == MOSQ_ERR_PLUGIN_DEFER){
rc_final = MOSQ_ERR_PLUGIN_DEFER;
}else{
return rc;
}
}
return rc_final;
}
int mosquitto_unpwd_check(struct mosquitto *context)
{
int rc;
bool plugin_used = false;
/* Global plugins */
if(db.config->security_options.plugin_callbacks.basic_auth){
rc = plugin__unpwd_check(&db.config->security_options, context);
if(rc == MOSQ_ERR_PLUGIN_IGNORE){
/* Do nothing */
}else if(rc == MOSQ_ERR_PLUGIN_DEFER){
plugin_used = true;
}else{
return rc;
}
}
/* Per listener plugins */
if(db.config->per_listener_settings){
if(context->listener == NULL){
return MOSQ_ERR_AUTH;
}
if(context->listener->security_options.plugin_callbacks.basic_auth){
rc = plugin__unpwd_check(&context->listener->security_options, context);
if(rc == MOSQ_ERR_PLUGIN_IGNORE){
/* Do nothing */
}else if(rc == MOSQ_ERR_PLUGIN_DEFER){
plugin_used = true;
}else{
return rc;
}
}
}
/* If all plugins deferred, this is a denial. plugin_used == false
* here, then no plugins were configured.
* anonymous logins are allowed. */
if(plugin_used == false){
if((db.config->per_listener_settings && context->listener->security_options.allow_anonymous != false)
|| (!db.config->per_listener_settings && db.config->security_options.allow_anonymous != false)){
return MOSQ_ERR_SUCCESS;
}else{
return MOSQ_ERR_AUTH;
}
}else{
/* Can't have got here without at least one plugin returning MOSQ_ERR_PLUGIN_DEFER.
* This will now be a denial, unless it is anon and allow anon is true. */
if(context->username == NULL &&
((db.config->per_listener_settings && context->listener->security_options.allow_anonymous != false)
|| (!db.config->per_listener_settings && db.config->security_options.allow_anonymous != false))){
return MOSQ_ERR_SUCCESS;
}else{
return MOSQ_ERR_AUTH;
}
}
return rc;
}

89
src/security.c
Unescape Escape View File

@ -519,92 +519,3 @@ int mosquitto_acl_check(struct mosquitto *context, const char *topic, uint32_t p
}
return rc_final;
}
static int plugin__unpwd_check(struct mosquitto__security_options *opts, struct mosquitto *context)
{
struct mosquitto_evt_basic_auth event_data;
struct mosquitto__callback *cb_base;
int rc;
int rc_final = MOSQ_ERR_PLUGIN_IGNORE;
DL_FOREACH(opts->plugin_callbacks.basic_auth, cb_base){
memset(&event_data, 0, sizeof(event_data));
event_data.client = context;
event_data.username = context->username;
event_data.password = context->password;
rc = cb_base->cb(MOSQ_EVT_BASIC_AUTH, &event_data, cb_base->userdata);
if(rc == MOSQ_ERR_PLUGIN_IGNORE){
/* Do nothing, this is as if the plugin doesn't exist */
}else if(rc == MOSQ_ERR_PLUGIN_DEFER){
rc_final = MOSQ_ERR_PLUGIN_DEFER;
}else{
return rc;
}
}
return rc_final;
}
int mosquitto_unpwd_check(struct mosquitto *context)
{
int rc;
bool plugin_used = false;
/* Global plugins */
if(db.config->security_options.plugin_callbacks.basic_auth){
rc = plugin__unpwd_check(&db.config->security_options, context);
if(rc == MOSQ_ERR_PLUGIN_IGNORE){
/* Do nothing */
}else if(rc == MOSQ_ERR_PLUGIN_DEFER){
plugin_used = true;
}else{
return rc;
}
}
/* Per listener plugins */
if(db.config->per_listener_settings){
if(context->listener == NULL){
return MOSQ_ERR_AUTH;
}
if(context->listener->security_options.plugin_callbacks.basic_auth){
rc = plugin__unpwd_check(&context->listener->security_options, context);
if(rc == MOSQ_ERR_PLUGIN_IGNORE){
/* Do nothing */
}else if(rc == MOSQ_ERR_PLUGIN_DEFER){
plugin_used = true;
}else{
return rc;
}
}
}
/* If all plugins deferred, this is a denial. plugin_used == false
* here, then no plugins were configured.
* anonymous logins are allowed. */
if(plugin_used == false){
if((db.config->per_listener_settings && context->listener->security_options.allow_anonymous != false)
|| (!db.config->per_listener_settings && db.config->security_options.allow_anonymous != false)){
return MOSQ_ERR_SUCCESS;
}else{
return MOSQ_ERR_AUTH;
}
}else{
/* Can't have got here without at least one plugin returning MOSQ_ERR_PLUGIN_DEFER.
* This will now be a denial, unless it is anon and allow anon is true. */
if(context->username == NULL &&
((db.config->per_listener_settings && context->listener->security_options.allow_anonymous != false)
|| (!db.config->per_listener_settings && db.config->security_options.allow_anonymous != false))){
return MOSQ_ERR_SUCCESS;
}else{
return MOSQ_ERR_AUTH;
}
}
return rc;
}

Write Preview
Loading…
Cancel
Save