drill-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sohami <...@git.apache.org>
Subject [GitHub] drill pull request #829: DRILL-5485: Remove WebServer dependency on DrillCli...
Date Wed, 24 May 2017 07:03:35 GMT
Github user sohami commented on a diff in the pull request:

    https://github.com/apache/drill/pull/829#discussion_r118158248
  
    --- Diff: exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/DrillRestServer.java
---
    @@ -91,13 +102,140 @@ protected void configure() {
             bind(new UserAuthEnabled(isAuthEnabled)).to(UserAuthEnabled.class);
             if (isAuthEnabled) {
               bindFactory(DrillUserPrincipalProvider.class).to(DrillUserPrincipal.class);
    +          bindFactory(AuthWebUserConnectionProvider.class).to(WebUserConnection.class);
             } else {
               bindFactory(AnonDrillUserPrincipalProvider.class).to(DrillUserPrincipal.class);
    +          bindFactory(AnonWebUserConnectionProvider.class).to(WebUserConnection.class);
             }
           }
         });
       }
     
    +  public static class AuthWebUserConnectionProvider implements Factory<WebUserConnection>
{
    +
    +    @Inject
    +    HttpServletRequest request;
    +
    +    @Inject
    +    WorkManager workManager;
    +
    +    @Override
    +    public WebUserConnection provide() {
    +      final HttpSession session = request.getSession();
    +      final Principal sessionUserPrincipal = request.getUserPrincipal();
    +
    +      // If there is no valid principal this means user is not logged in yet.
    +      if (sessionUserPrincipal == null) {
    +        return null;
    +      }
    +
    +      // User is logged in, let's check if we already have a valid UserSession.
    +      UserSession drillUserSession = (UserSession) session.getAttribute(UserSession.class.getSimpleName());
    +
    +      // Get the close future and remote address. If user is logging in first time then
these will be null and set
    +      // below. Otherwise these will be valid instances which is re-used for the session
lifetime.
    +      ChannelPromise closeFuture = (ChannelPromise) session.getAttribute(ChannelPromise.class.getSimpleName());
    +      SocketAddress remoteAddress = (SocketAddress) session.getAttribute(SocketAddress.class.getSimpleName());
    +
    +      // User is login in for the first time
    +      if (drillUserSession == null) {
    +        final DrillbitContext drillbitContext = workManager.getContext();
    +        drillUserSession = UserSession.Builder.newBuilder()
    +            .withCredentials(UserBitShared.UserCredentials.newBuilder()
    +                .setUserName(sessionUserPrincipal.getName())
    +                .build())
    +            .withOptionManager(drillbitContext.getOptionManager())
    +            .setSupportComplexTypes(drillbitContext.getConfig().getBoolean(ExecConstants.CLIENT_SUPPORT_COMPLEX_TYPES))
    --- End diff --
    
    For [DrillClient](https://github.com/apache/drill/blob/master/exec/java-exec/src/main/java/org/apache/drill/exec/client/DrillClient.java#L161)
by default this is set as true based on the config only. I looked into the usage and based
on this property in session, if false planner will introduce a project node to convert complex
types to JSON string. On WebServer when data batch is received we convert each data type to
it's string format (even the complex types). Hence it does support complex types since WebClient
now will see all the data in Json string format and should be fine.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

Mime
View raw message