This commit finally switches the RPC server implementation.
At the same we have to do other related changes to keep code compiling
and test environments running.
First avoid moving the session_info into the allocated pipes_struct memory
context as it is owned now by the core RPC server, and the s3compat pidl
compiler will update the pipes_struct session_info before dispatching
the call with dcesrv_call->auth_state->session_info.
Also, fix a segfault in the endpoint mapper daemon when it tries to delete
the endpoints previously registered over a NCALRPC connection.
If we have:
rpc_server : epmapper = external
rpc_server : lsarpc = external
rpc_daemon : epmd = fork
rpc_daemon : lsasd = fork
The sequence is:
* The endpoint mapper starts (start_epmd in source3/smbd/server.c)
* The lsarpc daemon starts (start_lsasd in source3/smbd/server.c)
* The lsarpc daemon creates the sockets and registers its endpoints
(rpc_ep_register in source3/rpc_server/lsasd.c)
* The endpoint registration code opens a NCALRPC connection to the
endpoint mapper daemon (ep_register in source3/librpc/rpc/dcerpc_ep.c)
and keeps it open to re-register if the endpoint mapper daemon dies
(rpc_ep_register_loop in source3/rpc_server/rpc_ep_register.c)
* When the endpoint mapper daemon accepts a NCALRPC connection it sets a
termination function (srv_epmapper_delete_endpoints)
* Suppose the lsarpc daemon exits. The NCALRPC connection termination
function is called.
* The termination function tries to delete all endpoints registered by that
connection by calling _epm_Delete
* _epm_Delete calls is_privileged_pipe which access to
pipes_struct->session_info.
As the call to _epm_Delete occurs outside of the PIDL generated code,
the pipes_stuct->session_info is NULL. This commit also sets
pipes_struct->session_info from the dcerpc_connection before calling
_epm_Delete. As the core rpc server supports security context multiplexing we
need to pass the dcesrv_connection to the termination function and let the
implementation pick a auth context. In the case of the endpoint mapper
the termination function has to pick one of type NCALRPC_AS_SYSTEM to
check if the connection is privileged and delete the endpoints
registered by the connection being closed.
Finally, the samba.tests.dcerpc.raw_protocol testsuite passes against
the ad_member environment.
Signed-off-by: Samuel Cabrero <scabrero@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
^samba.tests.dcerpc.raw_protocol.*.TestDCERPC_BIND.test_no_auth_presentation_ctx_invalid4
^samba.tests.dcerpc.raw_protocol.*.TestDCERPC_BIND.test_spnego_change_auth_type2
^samba.tests.dcerpc.raw_protocol.*.TestDCERPC_BIND.test_spnego_change_transfer
-^samba.tests.dcerpc.raw_protocol.*\(ad_member\)
# Association groups not implemented yet in s3 server implementation
^samba.tests.dcerpc.raw_protocol.*.TestDCERPC_BIND.test_assoc_group_fail1\(ad_member\)
^samba.tests.dcerpc.raw_protocol.*.TestDCERPC_BIND.test_assoc_group_fail2\(ad_member\)
^samba4.rpc.echo.*on.*with.object.echo.enum.*nt4_dc
^samba4.rpc.echo.*on.*with.object.echo.testcall.*nt4_dc
^samba4.rpc.echo.*on.*with.object.echo.testcall2.*nt4_dc
-^samba4.rpc.echo.*on.*with.object.echo.sinkdata.*nt4_dc
-^samba4.rpc.echo.*on.*with.object.echo.addone.*nt4_dc
^samba4.rpc.echo.*on.*ncacn_ip_tcp.*with.object.*nt4_dc
^samba.tests.dcerpc.dnsserver.samba.tests.dcerpc.dnsserver.DnsserverTests.test_add_duplicate_different_type.*
^samba.tests.dcerpc.dnsserver.samba.tests.dcerpc.dnsserver.DnsserverTests.test_rank_none.*
return ret;
}
-static void spoolss_client_terminated(struct pipes_struct *p, void *pvt)
+static void spoolss_client_terminated(struct dcesrv_connection *conn,
+ void *pvt)
{
struct spoolss_children_data *data;
#include "librpc/rpc/dcesrv_core.h"
#include "librpc/gen_ndr/ndr_epmapper_scompat.h"
+#include "rpc_server/rpc_server.h"
typedef uint32_t error_status_t;
return true;
}
-void srv_epmapper_delete_endpoints(struct pipes_struct *p, void *private_data)
+void srv_epmapper_delete_endpoints(struct dcesrv_connection *conn,
+ void *private_data)
{
+ struct pipes_struct *p = dcesrv_get_pipes_struct(conn);
+ struct dcesrv_auth *auth = NULL;
struct epm_Delete r;
struct dcesrv_ep_entry_list *el = p->ep_entries;
error_status_t result;
+ /* We have to set p->session_info to check if the connection is
+ * privileged and delete the endpoints registered by this connection.
+ * Set the default session info created at connection time as a
+ * fallback.
+ */
+ p->session_info = conn->default_auth_state->session_info;
+
+ /* Due to security context multiplexing we can have several states
+ * in the connection. Search the one of type NCALRPC_AS_SYSTEM to
+ * replace the default.
+ */
+ for (auth = conn->auth_states; auth != NULL; auth = auth->next) {
+ if (auth->auth_type == DCERPC_AUTH_TYPE_NCALRPC_AS_SYSTEM) {
+ p->session_info = auth->session_info;
+ }
+ }
+
while (el) {
struct dcesrv_ep_entry_list *next = el->next;
#ifndef _SRV_EPMAPPER_H_
#define _SRV_EPMAPPER_H_
+struct dcesrv_connection;
+
/**
* @brief Cleanup memory and other stuff.
*/
* @brief Cleanup function used to delete endpoints when a ncalrpc connection
* from an external daemon is lost
*/
-void srv_epmapper_delete_endpoints(struct pipes_struct *p, void *private_data);
+void srv_epmapper_delete_endpoints(struct dcesrv_connection *conn,
+ void *private_data);
#endif /*_SRV_EPMAPPER_H_ */
return ret;
}
-static void lsasd_client_terminated(struct pipes_struct *p, void *pvt)
+static void lsasd_client_terminated(struct dcesrv_connection *conn, void *pvt)
{
struct lsasd_children_data *data;
return ret;
}
-static void mdssd_client_terminated(struct pipes_struct *p, void *pvt)
+static void mdssd_client_terminated(struct dcesrv_connection *conn, void *pvt)
{
struct mdssd_children_data *data;
{
TALLOC_CTX *tmp_ctx = talloc_stackframe();
struct dcerpc_ncacn_conn *ncacn_conn = NULL;
- struct tevent_req *subreq;
+ struct dcesrv_connection *dcesrv_conn = NULL;
struct npa_state *npa;
NTSTATUS status;
int error;
transport,
ncacn_conn->remote_client_addr,
ncacn_conn->local_server_addr,
- &ncacn_conn->session_info,
&ncacn_conn->p,
&error);
if (rc == -1) {
goto out;
}
- ncacn_conn->send_queue = tevent_queue_create(ncacn_conn, "npa_server_write_queue");
- if (ncacn_conn->send_queue == NULL) {
+ /*
+ * This fills in dcesrv_conn->endpoint with the endpoint
+ * associated with the socket. From this point on we know
+ * which (group of) services we are handling, but not the
+ * specific interface.
+ */
+ status = dcesrv_endpoint_connect(ncacn_conn->dce_ctx,
+ ncacn_conn,
+ ncacn_conn->endpoint,
+ ncacn_conn->session_info,
+ ncacn_conn->ev_ctx,
+ DCESRV_CALL_STATE_FLAG_MAY_ASYNC,
+ &dcesrv_conn);
+ if (!NT_STATUS_IS_OK(status)) {
+ DBG_ERR("Failed to connect to endpoint: %s\n",
+ nt_errstr(status));
+ goto out;
+ }
+
+ dcesrv_conn->transport.private_data = ncacn_conn;
+ dcesrv_conn->transport.report_output_data =
+ dcesrv_sock_report_output_data;
+ dcesrv_conn->transport.terminate_connection =
+ dcesrv_transport_terminate_connection;
+ dcesrv_conn->send_queue = tevent_queue_create(dcesrv_conn,
+ "dcesrv send queue");
+ if (dcesrv_conn->send_queue == NULL) {
status = NT_STATUS_NO_MEMORY;
+ DBG_ERR("Failed to create send queue: %s\n",
+ nt_errstr(status));
goto out;
}
- subreq = dcerpc_read_ncacn_packet_send(ncacn_conn, ncacn_conn->ev_ctx,
- ncacn_conn->tstream);
- if (subreq == NULL) {
- DEBUG(2, ("Failed to start receiving packets\n"));
- status = NT_STATUS_PIPE_BROKEN;
+ dcesrv_conn->stream = talloc_move(dcesrv_conn, &ncacn_conn->tstream);
+ dcesrv_conn->local_address = ncacn_conn->local_server_addr;
+ dcesrv_conn->remote_address = ncacn_conn->remote_client_addr;
+
+ status = dcesrv_connection_loop_start(dcesrv_conn);
+ if (!NT_STATUS_IS_OK(status)) {
+ DBG_ERR("Failed to start dcesrv_connection loop: %s\n",
+ nt_errstr(status));
goto out;
}
- tevent_req_set_callback(subreq, dcerpc_ncacn_packet_process,
- ncacn_conn);
*pnpa = talloc_move(mem_ctx, &npa);
status = NT_STATUS_OK;
enum dcerpc_transport_t transport,
const struct tsocket_address *remote_address,
const struct tsocket_address *local_address,
- struct auth_session_info **psession_info,
struct pipes_struct **_p,
int *perrno)
{
- struct auth_session_info *session_info = *psession_info;
struct pipes_struct *p;
int ret;
return -1;
}
- if ((session_info->unix_token == NULL) ||
- (session_info->unix_info == NULL) ||
- (session_info->security_token == NULL)) {
- DBG_ERR("Supplied session_info was incomplete!\n");
- TALLOC_FREE(p);
- *perrno = EINVAL;
- return -1;
- }
-
- /* Don't call create_local_token(), we already have the full details here */
- p->session_info = talloc_move(p, psession_info);
-
*_p = p;
return 0;
}
state->termination_data);
}
-static int dcerpc_ncacn_conn_destructor(struct dcerpc_ncacn_conn *ncacn_conn)
+static int dcesrv_connection_destructor(struct dcesrv_connection *conn)
{
+ struct dcerpc_ncacn_conn *ncacn_conn = talloc_get_type_abort(
+ conn->transport.private_data,
+ struct dcerpc_ncacn_conn);
+
if (ncacn_conn->termination_fn != NULL) {
- ncacn_conn->termination_fn(ncacn_conn->p,
- ncacn_conn->termination_data);
+ ncacn_conn->termination_fn(conn, ncacn_conn->termination_data);
}
return 0;
if (ncacn_conn == NULL) {
return NT_STATUS_NO_MEMORY;
}
- talloc_set_destructor(ncacn_conn, dcerpc_ncacn_conn_destructor);
ncacn_conn->ev_ctx = ev_ctx;
ncacn_conn->msg_ctx = msg_ctx;
static void dcesrv_ncacn_accept_step2(struct dcerpc_ncacn_conn *ncacn_conn)
{
- struct tevent_req *subreq = NULL;
char *pipe_name = NULL;
uid_t uid;
gid_t gid;
ncacn_conn->endpoint->ep_description);
const char *endpoint = dcerpc_binding_get_string_option(
ncacn_conn->endpoint->ep_description, "endpoint");
+ struct dcesrv_connection *dcesrv_conn = NULL;
+ NTSTATUS status;
switch (transport) {
case NCACN_IP_TCP:
}
if (ncacn_conn->session_info == NULL) {
- NTSTATUS status;
-
status = make_session_info_anonymous(ncacn_conn,
&ncacn_conn->session_info);
if (!NT_STATUS_IS_OK(status)) {
transport,
ncacn_conn->remote_client_addr,
ncacn_conn->local_server_addr,
- &ncacn_conn->session_info,
&ncacn_conn->p,
&sys_errno);
if (rc < 0) {
return;
}
- ncacn_conn->send_queue = tevent_queue_create(ncacn_conn,
- "dcerpc send queue");
- if (ncacn_conn->send_queue == NULL) {
- DBG_ERR("No memory\n");
- ncacn_terminate_connection(ncacn_conn, "No memory");
+ /*
+ * This fills in dcesrv_conn->endpoint with the endpoint
+ * associated with the socket. From this point on we know
+ * which (group of) services we are handling, but not the
+ * specific interface.
+ */
+ status = dcesrv_endpoint_connect(ncacn_conn->dce_ctx,
+ ncacn_conn,
+ ncacn_conn->endpoint,
+ ncacn_conn->session_info,
+ ncacn_conn->ev_ctx,
+ DCESRV_CALL_STATE_FLAG_MAY_ASYNC,
+ &dcesrv_conn);
+ if (!NT_STATUS_IS_OK(status)) {
+ DBG_ERR("Failed to connect to endpoint: %s\n",
+ nt_errstr(status));
+ ncacn_terminate_connection(ncacn_conn, nt_errstr(status));
return;
}
+ talloc_set_destructor(dcesrv_conn, dcesrv_connection_destructor);
- subreq = dcerpc_read_ncacn_packet_send(ncacn_conn,
- ncacn_conn->ev_ctx,
- ncacn_conn->tstream);
- if (subreq == NULL) {
- DBG_ERR("No memory\n");
- ncacn_terminate_connection(ncacn_conn, "No memory");
+ dcesrv_conn->transport.private_data = ncacn_conn;
+ dcesrv_conn->transport.report_output_data =
+ dcesrv_sock_report_output_data;
+ dcesrv_conn->transport.terminate_connection =
+ dcesrv_transport_terminate_connection;
+ dcesrv_conn->send_queue = tevent_queue_create(dcesrv_conn,
+ "dcesrv send queue");
+ if (dcesrv_conn->send_queue == NULL) {
+ status = NT_STATUS_NO_MEMORY;
+ DBG_ERR("Failed to create send queue: %s\n",
+ nt_errstr(status));
+ ncacn_terminate_connection(ncacn_conn, nt_errstr(status));
return;
}
- tevent_req_set_callback(subreq, dcerpc_ncacn_packet_process, ncacn_conn);
-
+ dcesrv_conn->stream = talloc_move(dcesrv_conn, &ncacn_conn->tstream);
+ dcesrv_conn->local_address = ncacn_conn->local_server_addr;
+ dcesrv_conn->remote_address = ncacn_conn->remote_client_addr;
+ status = dcesrv_connection_loop_start(dcesrv_conn);
+ if (!NT_STATUS_IS_OK(status)) {
+ DBG_ERR("Failed to start dcesrv_connection loop: %s\n",
+ nt_errstr(status));
+ ncacn_terminate_connection(ncacn_conn, nt_errstr(status));
+ }
DBG_DEBUG("dcerpc_ncacn_accept done\n");
return;
return dcesrv_assoc_group_new(call, assoc_group_id);
}
+void dcesrv_transport_terminate_connection(struct dcesrv_connection *dce_conn,
+ const char *reason)
+{
+ struct dcerpc_ncacn_conn *ncacn_conn = talloc_get_type_abort(
+ dce_conn->transport.private_data,
+ struct dcerpc_ncacn_conn);
+
+ ncacn_terminate_connection(ncacn_conn, reason);
+}
+
static void ncacn_terminate_connection(struct dcerpc_ncacn_conn *conn,
const char *reason)
{
struct auth_session_info;
struct cli_credentials;
-typedef void (*dcerpc_ncacn_termination_fn)(struct pipes_struct *, void *);
+typedef void (*dcerpc_ncacn_termination_fn)(struct dcesrv_connection *,
+ void *);
struct dcerpc_ncacn_conn {
int sock;
enum dcerpc_transport_t transport,
const struct tsocket_address *remote_address,
const struct tsocket_address *local_address,
- struct auth_session_info **session_info,
struct pipes_struct **_p,
int *perrno);
struct pipes_struct *dcesrv_get_pipes_struct(struct dcesrv_connection *conn);
+void dcesrv_transport_terminate_connection(struct dcesrv_connection *dce_conn,
+ const char *reason);
+
#endif /* _PRC_SERVER_H_ */
projects / thirdparty / samba.git / commitdiff
