Revert "Fix xff cn username"

apps/vmq_server/src/vmq_websocket.erl

@@ -108,16 +108,8 @@ init(Req, Opts) ->
                                             xff_cn_header, Opts, <<"x-ssl-client-cn">>
                                         ),
                                         HN = ensure_binary(CNHeaderName),
-                                        case cowboy_req:header(HN, Req0) of
-                                            undefined ->
-                                                {vmq_cowboy_websocket, Req0,
-                                                    {error, no_xff_cn_username}};
-                                            <<>> ->
-                                                {vmq_cowboy_websocket, Req0,
-                                                    {error, no_xff_cn_username}};
-                                            XFFCN ->
-                                                FsmMod:init(Peer, [{preauth, XFFCN} | Opts])
-                                        end
+                                        XFFCN = cowboy_req:header(HN, Req),
+                                        FsmMod:init(Peer, [{preauth, XFFCN} | Opts])
                                 end;
                             true ->
                                 case ProxyInfo0 of
@@ -150,8 +142,7 @@ init(Req, Opts) ->
             {vmq_cowboy_websocket, Req, {error, unsupported_protocol}}
     end.
 
-websocket_init({error, E}) ->
-    ?LOG_DEBUG("websocket init error ~p~n", [E]),
+websocket_init({error, unsupported_protocol}) ->
     _ = vmq_metrics:incr_socket_open(),
     {stop, #state{fsm_state = terminated}};
 websocket_init(State) ->

changelog.md

@@ -1,4 +1,3 @@
-- Protect against empty XFF CN/Username
 - Add simple options to HTTP health listener (health/ping)
 - Remove deprecated allow_multiple_sessions 
 - Improve systemd support: Add support of systemd-notify