Re: [libvirt] [PATCH 08/14] rpc: Refactor the condition whether a client needs authentication

On 12/12/2017 06:36 AM, Marc Hartmayer wrote: > Add virNetServerClientAuthMethodImpliesAuthenticated() for deciding > whether a authentication method implies that a client is automatically > authenticated or not. Use this new function in > virNetServerClientNeedAuth(). > > Signed-off-by: Marc Hartmayer <mhartmay(a)linux.vnet.ibm.com&gt; > Reviewed-by: Boris Fiuczynski <fiuczy(a)linux.vnet.ibm.com&gt; > Reviewed-by: Stefan Zimmermann <stzi(a)linux.vnet.ibm.com&gt; > --- > src/rpc/virnetserverclient.c | 22 +++++++++++++++++++--- > 1 file changed, 19 insertions(+), 3 deletions(-) > I see Daniel has been looking too - and I think if you extract parts of the subsequent patch into this patch with the *Locked name then perhaps there'd be less difference in the subsequent patch. In later patches where virNetServerClientAuthMethodImpliesAuthenticated is used in other parts of the code - I see no reason why we couldn't compare directly to VIR_NET_SERVER_SERVICE_AUTH_NONE.

In particular I'm thinking of that auth_pending checking where there's no "client". This then just becomes "Introduce virNetServerClientNeedAuthLocked" John > diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c > index 96fd1e6d15c2..616b6fe115e5 100644 > --- a/src/rpc/virnetserverclient.c > +++ b/src/rpc/virnetserverclient.c > @@ -354,6 +354,23 @@ static void virNetServerClientSockTimerFunc(int timer, > } > > > +/** > + * virNetServerClientAuthMethodImpliesAuthenticated: > + * @auth: authentication method to check > + * > + * Check if the passed authentication method implies that a client is > + * automatically authenticated. > + * > + * Returns true if @auth implies that a client is automatically > + * authenticated, otherwise false. > + */ > +static bool > +virNetServerClientAuthMethodImpliesAuthenticated(int auth) > +{ > + return auth == VIR_NET_SERVER_SERVICE_AUTH_NONE; > +} > + > + > static virNetServerClientPtr > virNetServerClientNewInternal(unsigned long long id, > virNetSocketPtr sock, > @@ -1515,10 +1532,9 @@ int virNetServerClientSendMessage(virNetServerClientPtr client, > > bool virNetServerClientNeedAuth(virNetServerClientPtr client) > { > - bool need = true; > + bool need; > virObjectLock(client); > - if (client->auth == VIR_NET_SERVER_SERVICE_AUTH_NONE) > - need = false; > + need = !virNetServerClientAuthMethodImpliesAuthenticated(client->auth); > virObjectUnlock(client); > return need; > } > -- libvir-list mailing list libvir-list(a)redhat.com https://www.redhat.com/mailman/listinfo/libvir-list