-
Notifications
You must be signed in to change notification settings - Fork 69
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #149 from bohmber/MYFACES-4373-master
prefer secureRandom over random
- Loading branch information
Showing
2 changed files
with
76 additions
and
76 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
144 changes: 72 additions & 72 deletions
144
impl/src/main/java/org/apache/myfaces/push/cdi/WebsocketChannelTokenBuilderBean.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,72 +1,72 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| package org.apache.myfaces.push.cdi; | ||
|
|
||
| import jakarta.annotation.PostConstruct; | ||
| import jakarta.enterprise.context.ApplicationScoped; | ||
| import jakarta.faces.context.FacesContext; | ||
| import org.apache.myfaces.util.token.CsrfSessionTokenFactory; | ||
| import org.apache.myfaces.util.token.CsrfSessionTokenFactoryRandom; | ||
| import org.apache.myfaces.util.token.CsrfSessionTokenFactorySecureRandom; | ||
| import org.apache.myfaces.config.MyfacesConfig; | ||
|
|
||
| @ApplicationScoped | ||
| public class WebsocketChannelTokenBuilderBean | ||
| { | ||
| private CsrfSessionTokenFactory csrfSessionTokenFactory; | ||
|
|
||
| private boolean initialized; | ||
|
|
||
| public WebsocketChannelTokenBuilderBean() | ||
| { | ||
| } | ||
|
|
||
| @PostConstruct | ||
| public void init() | ||
| { | ||
| FacesContext facesContext = FacesContext.getCurrentInstance(); | ||
| if (facesContext != null) | ||
| { | ||
| internalInit(facesContext); | ||
| } | ||
| } | ||
|
|
||
| private synchronized void internalInit(FacesContext facesContext) | ||
| { | ||
| String csrfRandomMode = MyfacesConfig.getCurrentInstance(facesContext).getRandomKeyInViewStateSessionToken(); | ||
| if (MyfacesConfig.RANDOM_KEY_IN_WEBSOCKET_SESSION_TOKEN_SECURE_RANDOM.equals(csrfRandomMode)) | ||
| { | ||
| csrfSessionTokenFactory = new CsrfSessionTokenFactorySecureRandom(facesContext); | ||
| } | ||
| else | ||
| { | ||
| csrfSessionTokenFactory = new CsrfSessionTokenFactoryRandom(facesContext); | ||
| } | ||
| initialized = true; | ||
| } | ||
|
|
||
| public String createChannelToken(FacesContext facesContext, String channel) | ||
| { | ||
| if (!initialized) | ||
| { | ||
| internalInit(facesContext); | ||
| } | ||
| return csrfSessionTokenFactory.createToken(facesContext); | ||
| } | ||
| } | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| package org.apache.myfaces.push.cdi; | ||
|
|
||
| import jakarta.annotation.PostConstruct; | ||
| import jakarta.enterprise.context.ApplicationScoped; | ||
| import jakarta.faces.context.FacesContext; | ||
| import org.apache.myfaces.util.token.CsrfSessionTokenFactory; | ||
| import org.apache.myfaces.util.token.CsrfSessionTokenFactoryRandom; | ||
| import org.apache.myfaces.util.token.CsrfSessionTokenFactorySecureRandom; | ||
| import org.apache.myfaces.config.MyfacesConfig; | ||
|
|
||
| @ApplicationScoped | ||
| public class WebsocketChannelTokenBuilderBean | ||
| { | ||
| private CsrfSessionTokenFactory csrfSessionTokenFactory; | ||
|
|
||
| private boolean initialized; | ||
|
|
||
| public WebsocketChannelTokenBuilderBean() | ||
| { | ||
| } | ||
|
|
||
| @PostConstruct | ||
| public void init() | ||
| { | ||
| FacesContext facesContext = FacesContext.getCurrentInstance(); | ||
| if (facesContext != null) | ||
| { | ||
| internalInit(facesContext); | ||
| } | ||
| } | ||
|
|
||
| private synchronized void internalInit(FacesContext facesContext) | ||
| { | ||
| String csrfRandomMode = MyfacesConfig.getCurrentInstance(facesContext).getRandomKeyInViewStateSessionToken(); | ||
| if (MyfacesConfig.RANDOM_KEY_IN_WEBSOCKET_SESSION_TOKEN_RANDOM.equals(csrfRandomMode)) | ||
| { | ||
| csrfSessionTokenFactory = new CsrfSessionTokenFactoryRandom(facesContext); | ||
| } | ||
| else | ||
| { | ||
| csrfSessionTokenFactory = new CsrfSessionTokenFactorySecureRandom(facesContext); | ||
| } | ||
| initialized = true; | ||
| } | ||
|
|
||
| public String createChannelToken(FacesContext facesContext, String channel) | ||
| { | ||
| if (!initialized) | ||
| { | ||
| internalInit(facesContext); | ||
| } | ||
| return csrfSessionTokenFactory.createToken(facesContext); | ||
| } | ||
| } |