]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
s4:nbt_server: simulate nmbd and provide unexpected handling
authorStefan Metzmacher <metze@samba.org>
Wed, 14 Feb 2024 11:34:48 +0000 (12:34 +0100)
committerJule Anger <janger@samba.org>
Wed, 3 Jul 2024 08:48:12 +0000 (08:48 +0000)
This is needed in order to let nbt_getdc() work against
another AD DC and get back a modern response with
DNS based names. Instead of falling back to
the ugly name_status_find() that simulates just
an NETLOGON_SAM_LOGON_RESPONSE_NT40 response.

This way dsgetdcname() can work with just the netbios
domain name given and still return an active directory
response.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15620

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
(cherry picked from commit 796f33c05a0ca337b675b5d4d127f7c53b22528f)

selftest/target/Samba4.pm
source4/nbt_server/dgram/request.c
source4/nbt_server/interfaces.c
source4/nbt_server/nbt_server.c
source4/nbt_server/nbt_server.h
source4/nbt_server/wscript_build

index cbaacce48da1b1872964c599a2a51baeb83d03c5..364806e71fecdd806fd6cc7ab1fc89f75499d54b 100755 (executable)
@@ -618,6 +618,7 @@ sub provision_raw_prepare($$$$$$$$$$$$$$)
        $ctx->{statedir} = "$prefix_abs/statedir";
        $ctx->{cachedir} = "$prefix_abs/cachedir";
        $ctx->{winbindd_socket_dir} = "$prefix_abs/wbsock";
+       $ctx->{nmbd_socket_dir} = "$prefix_abs/nmbsock";
        $ctx->{ntp_signd_socket_dir} = "$prefix_abs/ntp_signd_socket";
        $ctx->{nsswrap_passwd} = "$ctx->{etcdir}/passwd";
        $ctx->{nsswrap_group} = "$ctx->{etcdir}/group";
@@ -774,6 +775,7 @@ sub provision_raw_step1($$)
        state directory = $ctx->{statedir}
        cache directory = $ctx->{cachedir}
        winbindd socket directory = $ctx->{winbindd_socket_dir}
+       nmbd:socket dir = $ctx->{nmbd_socket_dir}
        ntp signd socket directory = $ctx->{ntp_signd_socket_dir}
        winbind separator = /
        interfaces = $interfaces
index ea2b6e8b98ac0afdaa77afcda2eddd547c2e11d3..76145147ad0cefcbf39380c7d263940adb27a840 100644 (file)
 #include "nbt_server/dgram/proto.h"
 #include "librpc/gen_ndr/ndr_nbt.h"
 #include "param/param.h"
+#include "lib/util/util_str_escape.h"
+#include "lib/util/util_net.h"
+#include "../source3/include/fstring.h"
+#include "../source3/libsmb/nmblib.h"
+#include "../source3/libsmb/unexpected.h"
 
 /*
   a list of mailslots that we have static handlers for
@@ -51,8 +56,55 @@ void dgram_request_handler(struct nbt_dgram_socket *dgmsock,
                           struct nbt_dgram_packet *packet,
                           struct socket_address *src)
 {
-       DEBUG(0,("General datagram request from %s:%d\n", src->addr, src->port));
-       NDR_PRINT_DEBUG(nbt_dgram_packet, packet);
+       struct nbtd_interface *iface =
+               talloc_get_type_abort(dgmsock->incoming.private_data,
+               struct nbtd_interface);
+       struct nbtd_server *nbtsrv = iface->nbtsrv;
+       const char *mailslot_name = NULL;
+       struct packet_struct *pstruct = NULL;
+       DATA_BLOB blob = { .length = 0, };
+       enum ndr_err_code ndr_err;
+
+       mailslot_name = dgram_mailslot_name(packet);
+       if (mailslot_name != NULL) {
+               DBG_DEBUG("Unexpected mailslot[%s] datagram request from %s:%d\n",
+                         log_escape(packet, mailslot_name),
+                         src->addr, src->port);
+       } else {
+               DBG_DEBUG("Unexpected general datagram request from %s:%d\n",
+                         src->addr, src->port);
+       }
+
+       if (CHECK_DEBUGLVL(DBGLVL_DEBUG)) {
+               NDR_PRINT_DEBUG(nbt_dgram_packet, packet);
+       }
+
+       /*
+        * For now we only pass DGRAM_DIRECT_UNIQUE
+        * messages via nb_packet_dispatch() to
+        * nbtsrv->unexpected_server
+        */
+       if (packet->msg_type != DGRAM_DIRECT_UNIQUE) {
+               return;
+       }
+
+       ndr_err = ndr_push_struct_blob(&blob, packet, packet,
+                       (ndr_push_flags_fn_t)ndr_push_nbt_dgram_packet);
+       if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+               DBG_ERR("ndr_push_nbt_dgram_packet - %s\n",
+                       ndr_errstr(ndr_err));
+               return;
+       }
+
+       pstruct = parse_packet((char *)blob.data,
+                              blob.length,
+                              DGRAM_PACKET,
+                              interpret_addr2(src->addr),
+                              src->port);
+       if (pstruct != NULL) {
+               nb_packet_dispatch(nbtsrv->unexpected_server, pstruct);
+               free_packet(pstruct);
+       }
 }
 
 
index b946a1dedf40827236410dd698a834d7d6dccc39..0888c1b54a65195485f74701e233dfe254f107be 100644 (file)
@@ -31,6 +31,9 @@
 #include "param/param.h"
 #include "lib/util/util_net.h"
 #include "lib/util/idtree.h"
+#include "../source3/include/fstring.h"
+#include "../source3/libsmb/nmblib.h"
+#include "../source3/libsmb/unexpected.h"
 
 /*
   receive an incoming request and dispatch it to the right place
@@ -115,7 +118,33 @@ static void nbtd_unexpected_handler(struct nbt_name_socket *nbtsock,
        }
 
        if (!req) {
+               struct packet_struct *pstruct = NULL;
+               DATA_BLOB blob = { .length = 0, };
+               enum ndr_err_code ndr_err;
+
+               /*
+                * Here we have NBT_FLAG_REPLY
+                */
                DEBUG(10,("unexpected from src[%s] unable to redirected\n", src->addr));
+
+               ndr_err = ndr_push_struct_blob(&blob, packet, packet,
+                               (ndr_push_flags_fn_t)ndr_push_nbt_name_packet);
+               if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+                       DBG_ERR("ndr_push_nbt_name_packet - %s\n",
+                               ndr_errstr(ndr_err));
+                       return;
+               }
+
+               pstruct = parse_packet((char *)blob.data,
+                                      blob.length,
+                                      NMB_PACKET,
+                                      interpret_addr2(src->addr),
+                                      src->port);
+               if (pstruct != NULL) {
+                       nb_packet_dispatch(nbtsrv->unexpected_server, pstruct);
+                       free_packet(pstruct);
+               }
+
                return;
        }
 
index 6d28bbdbdad1df1ae6984c699322b2d2017b04e5..c3f9fac40fae1bc54c8e5a1eefe12f8132162148 100644 (file)
 #include "auth/auth.h"
 #include "dsdb/samdb/samdb.h"
 #include "param/param.h"
+#include "dynconfig/dynconfig.h"
+#include "lib/util/pidfile.h"
+#include "lib/util/util_net.h"
+#include "lib/socket/socket.h"
+#include "../source3/include/fstring.h"
+#include "../source3/libsmb/nmblib.h"
+#include "../source3/libsmb/unexpected.h"
+#include "../source3/lib/util_procid.h"
 
 NTSTATUS server_service_nbtd_init(TALLOC_CTX *);
 
+static void nbtd_server_msg_send_packet(struct imessaging_context *msg,
+                                       void *private_data,
+                                       uint32_t msg_type,
+                                       struct server_id src,
+                                       size_t num_fds,
+                                       int *fds,
+                                       DATA_BLOB *data)
+{
+       TALLOC_CTX *frame = talloc_stackframe();
+       struct nbtd_server *nbtsrv =
+               talloc_get_type_abort(private_data,
+               struct nbtd_server);
+       struct packet_struct *p = (struct packet_struct *)data->data;
+       struct sockaddr_storage ss;
+       struct socket_address *dst = NULL;
+       struct nbtd_interface *iface = NULL;
+       char buf[1024] = { 0, };
+       DATA_BLOB blob = { .length = 0, };
+
+       DBG_DEBUG("Received send_packet from %u\n", (unsigned int)procid_to_pid(&src));
+
+       if (data->length != sizeof(struct packet_struct)) {
+               DBG_WARNING("Discarding invalid packet length from %u\n",
+                         (unsigned int)procid_to_pid(&src));
+               TALLOC_FREE(frame);
+               return;
+       }
+
+       if ((p->packet_type != NMB_PACKET) &&
+           (p->packet_type != DGRAM_PACKET)) {
+               DBG_WARNING("Discarding invalid packet type from %u: %d\n",
+                         (unsigned int)procid_to_pid(&src), p->packet_type);
+               TALLOC_FREE(frame);
+               return;
+       }
+
+       if (p->packet_type == DGRAM_PACKET) {
+               p->port = 138;
+       }
+
+       in_addr_to_sockaddr_storage(&ss, p->ip);
+       dst = socket_address_from_sockaddr_storage(frame, &ss, p->port);
+       if (dst == NULL) {
+               TALLOC_FREE(frame);
+               return;
+       }
+       if (p->port == 0) {
+               DBG_WARNING("Discarding packet with missing port for addr[%s] "
+                           "from %u\n",
+                           dst->addr, (unsigned int)procid_to_pid(&src));
+               TALLOC_FREE(frame);
+               return;
+       }
+
+       iface = nbtd_find_request_iface(nbtsrv, dst->addr, true);
+       if (iface == NULL) {
+               DBG_WARNING("Could not find iface for packet to addr[%s] "
+                           "from %u\n",
+                           dst->addr, (unsigned int)procid_to_pid(&src));
+               TALLOC_FREE(frame);
+               return;
+       }
+
+       p->recv_fd = -1;
+       p->send_fd = -1;
+
+       if (p->packet_type == DGRAM_PACKET) {
+               p->packet.dgram.header.source_ip.s_addr = interpret_addr(iface->ip_address);
+               p->packet.dgram.header.source_port = 138;
+       }
+
+       blob.length = build_packet(buf, sizeof(buf), p);
+       if (blob.length == 0) {
+               TALLOC_FREE(frame);
+               return;
+       }
+       blob.data = (uint8_t *)buf;
+
+       if (p->packet_type == DGRAM_PACKET) {
+               nbt_dgram_send_raw(iface->dgmsock, dst, blob);
+       } else {
+               nbt_name_send_raw(iface->nbtsock, dst, blob);
+       }
+
+       TALLOC_FREE(frame);
+}
+
+static int nbtd_server_destructor(struct nbtd_server *nbtsrv)
+{
+       struct task_server *task = nbtsrv->task;
+
+       pidfile_unlink(lpcfg_pid_directory(task->lp_ctx), "nmbd");
+
+       return 0;
+}
+
 /*
   startup the nbtd task
 */
@@ -40,6 +144,8 @@ static NTSTATUS nbtd_task_init(struct task_server *task)
        struct nbtd_server *nbtsrv;
        NTSTATUS status;
        struct interface *ifaces;
+       const char *nmbd_socket_dir = NULL;
+       int unexpected_clients;
 
        load_interface_list(task, task->lp_ctx, &ifaces);
 
@@ -66,6 +172,8 @@ static NTSTATUS nbtd_task_init(struct task_server *task)
        nbtsrv->bcast_interface = NULL;
        nbtsrv->wins_interface  = NULL;
 
+       talloc_set_destructor(nbtsrv, nbtd_server_destructor);
+
        /* start listening on the configured network interfaces */
        status = nbtd_startup_interfaces(nbtsrv, task->lp_ctx, ifaces);
        if (!NT_STATUS_IS_OK(status)) {
@@ -73,6 +181,30 @@ static NTSTATUS nbtd_task_init(struct task_server *task)
                return status;
        }
 
+       nmbd_socket_dir = lpcfg_parm_string(task->lp_ctx,
+                                           NULL,
+                                           "nmbd",
+                                           "socket dir");
+       if (nmbd_socket_dir == NULL) {
+               nmbd_socket_dir = get_dyn_NMBDSOCKETDIR();
+       }
+
+       unexpected_clients = lpcfg_parm_int(task->lp_ctx,
+                                           NULL,
+                                           "nmbd",
+                                           "unexpected_clients",
+                                           200);
+
+       status = nb_packet_server_create(nbtsrv,
+                                        nbtsrv->task->event_ctx,
+                                        nmbd_socket_dir,
+                                        unexpected_clients,
+                                        &nbtsrv->unexpected_server);
+       if (!NT_STATUS_IS_OK(status)) {
+               task_server_terminate(task, "nbtd failed to start unexpected_server", true);
+               return status;
+       }
+
        nbtsrv->sam_ctx = samdb_connect(nbtsrv,
                                        task->event_ctx,
                                        task->lp_ctx,
@@ -93,11 +225,22 @@ static NTSTATUS nbtd_task_init(struct task_server *task)
 
        nbtd_register_irpc(nbtsrv);
 
+       status = imessaging_register(task->msg_ctx,
+                                    nbtsrv,
+                                    MSG_SEND_PACKET,
+                                    nbtd_server_msg_send_packet);
+       if (!NT_STATUS_IS_OK(status)) {
+               task_server_terminate(task, "nbtd failed imessaging_register(MSG_SEND_PACKET)", true);
+               return status;
+       }
+
        /* start the process of registering our names on all interfaces */
        nbtd_register_names(nbtsrv);
 
        irpc_add_name(task->msg_ctx, "nbt_server");
 
+       pidfile_create(lpcfg_pid_directory(task->lp_ctx), "nmbd");
+
        return NT_STATUS_OK;
 }
 
index c80e5bfca0789f974ce0857a92d3b3adfb53550f..cbad3e96213b022089fc33472d6e5c980817b62b 100644 (file)
@@ -78,6 +78,8 @@ struct nbtd_server {
        struct nbtd_statistics stats;
 
        struct ldb_context *sam_ctx;
+
+       struct nb_packet_server *unexpected_server;
 };
 
 
index 9d0c24a14e2046e60432d9b193ba0212f30f975f..ce436e80106522e84f1d34f6f11d9d339638158a 100644 (file)
@@ -38,7 +38,7 @@ bld.SAMBA_SUBSYSTEM('NBTD_DGRAM',
 bld.SAMBA_SUBSYSTEM('NBT_SERVER',
        source='interfaces.c register.c query.c nodestatus.c defense.c packet.c irpc.c',
        autoproto='nbt_server_proto.h',
-       deps='cli-nbt NBTD_WINS NBTD_DGRAM service',
+       deps='cli-nbt NBTD_WINS NBTD_DGRAM service LIBNMB',
        enabled=bld.AD_DC_BUILD_IS_ENABLED()
        )