diff options
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | docs/release-notes.rst | 13 | ||||
| -rw-r--r-- | extra/docker/clamp/docker-compose.yml | 2 | ||||
| -rw-r--r-- | src/main/java/org/onap/clamp/clds/config/DefaultUserConfiguration.java | 4 | ||||
| -rwxr-xr-x | src/test/resources/http-cache/start_http_cache.sh | 2 | ||||
| -rw-r--r-- | ui-react/src/LoopUI.js | 11 | ||||
| -rw-r--r-- | ui-react/src/LoopUI.test.js | 9 | ||||
| -rw-r--r-- | ui-react/src/__snapshots__/LoopUI.test.js.snap | 9 | ||||
| -rw-r--r-- | ui-react/src/__snapshots__/OnapClamp.test.js.snap | 9 | ||||
| -rw-r--r-- | ui-react/src/api/UserService.js | 25 |
10 files changed, 11 insertions, 75 deletions
@@ -206,7 +206,7 @@ In that case, the credentials should be specified in `src/main/resources/clds/cl Passwords should be hashed using Bcrypt : ``` -# pip3 install bcrypt # if you don't have the bcrypt python lib installed, should be done once. +# pip3 install --no-cache-dir bcrypt # if you don't have the bcrypt python lib installed, should be done once. # python3 -c 'import bcrypt; print(bcrypt.hashpw("password".encode(), bcrypt.gensalt(rounds=10, prefix=b"2a")))' ``` diff --git a/docs/release-notes.rst b/docs/release-notes.rst index a4e1db13e..40d7e71da 100644 --- a/docs/release-notes.rst +++ b/docs/release-notes.rst @@ -55,12 +55,13 @@ Quick Links: - The Upgrade strategy for Frankfurt can be found here:`<https://wiki.onap.org/display/DW/Frankfurt+CLAMP+Container+upgrade+strategy>`_ - New Docker Containers are available. the list of containers composing this release are below: - - clamp-backend-filebeat-onap: docker.elastic.co/beats/filebeat 5.5.0 - - clamp-backend: nexus3.onap.org:10001/onap/clamp-backend 5.0.7 - - clamp-frontend: nexus3.onap.org:10001/onap/clamp-frontend 5.0.7 - - clamp-dash-es: nexus3.onap.org:10001/onap/clamp-dashboard-elasticsearch 5.0.3 - - clamp-dash-kibana: nexus3.onap.org:10001/onap/clamp-dashboard-kibana 5.0.3 - - clamp-dash-logstash: nexus3.onap.org:10001/onap/clamp-dashboard-logstash 5.0.3 + + - clamp-backend-filebeat-onap: docker.elastic.co/beats/filebeat 5.5.0 + - clamp-backend: nexus3.onap.org:10001/onap/clamp-backend 5.0.7 + - clamp-frontend: nexus3.onap.org:10001/onap/clamp-frontend 5.0.7 + - clamp-dash-es: nexus3.onap.org:10001/onap/clamp-dashboard-elasticsearch 5.0.3 + - clamp-dash-kibana: nexus3.onap.org:10001/onap/clamp-dashboard-kibana 5.0.3 + - clamp-dash-logstash: nexus3.onap.org:10001/onap/clamp-dashboard-logstash 5.0.3 Version: 4.1.3 (El-Alto) diff --git a/extra/docker/clamp/docker-compose.yml b/extra/docker/clamp/docker-compose.yml index 8d57be038..81cac25cb 100644 --- a/extra/docker/clamp/docker-compose.yml +++ b/extra/docker/clamp/docker-compose.yml @@ -35,4 +35,4 @@ services: - "../../../src/test/resources/http-cache/:/script/:ro" ports: - "8085:8085" - command: /bin/sh -c "pip install requests && pip install simplejson && python -u /script/third_party_proxy.py -v true --port 8085 --root /thirdparty --proxyaddress third-party-proxy:8085" + command: /bin/sh -c "pip install --no-cache-dir requests && pip install --no-cache-dir simplejson && python -u /script/third_party_proxy.py -v true --port 8085 --root /thirdparty --proxyaddress third-party-proxy:8085" diff --git a/src/main/java/org/onap/clamp/clds/config/DefaultUserConfiguration.java b/src/main/java/org/onap/clamp/clds/config/DefaultUserConfiguration.java index d20a7370c..cfd5f990f 100644 --- a/src/main/java/org/onap/clamp/clds/config/DefaultUserConfiguration.java +++ b/src/main/java/org/onap/clamp/clds/config/DefaultUserConfiguration.java @@ -74,9 +74,7 @@ public class DefaultUserConfiguration extends WebSecurityConfigurerAdapter { protected void configure(HttpSecurity http) { try { http.csrf().disable().httpBasic().and().authorizeRequests().antMatchers("/restservices/clds/v1/user/**") - .authenticated().anyRequest().permitAll().and().logout() - .logoutUrl("/restservices/clds/v1/user/logout").logoutSuccessUrl("/index.html") - .invalidateHttpSession(true).deleteCookies("JSESSIONID").and().sessionManagement() + .authenticated().anyRequest().permitAll().and().sessionManagement() .maximumSessions(1); } catch (Exception e) { diff --git a/src/test/resources/http-cache/start_http_cache.sh b/src/test/resources/http-cache/start_http_cache.sh index 178ac80af..1f84b56f5 100755 --- a/src/test/resources/http-cache/start_http_cache.sh +++ b/src/test/resources/http-cache/start_http_cache.sh @@ -47,6 +47,6 @@ esac done echo 'Installing requests packages for Python' -pip install requests +pip install --no-cache-dir requests echo 'Executing the Http proxy in Cache mode only' python -u third_party_proxy.py --port 8080 --root /usr/src/http-cache-app/data-cache $python_proxyaddress diff --git a/ui-react/src/LoopUI.js b/ui-react/src/LoopUI.js index 107992137..8624726be 100644 --- a/ui-react/src/LoopUI.js +++ b/ui-react/src/LoopUI.js @@ -114,7 +114,6 @@ export default class LoopUI extends React.Component { constructor() { super(); this.getUser = this.getUser.bind(this); - this.logout = this.logout.bind(this); this.updateLoopCache = this.updateLoopCache.bind(this); this.loadLoop = this.loadLoop.bind(this); this.closeLoop = this.closeLoop.bind(this); @@ -132,14 +131,6 @@ export default class LoopUI extends React.Component { this.setState({ userName: user }) }); } - - logout() { - UserService.logout().then(user => { - this.setState({ userName: user }); - window.location.reload(); - }); - - } renderMenuNavBar() { return ( @@ -152,7 +143,6 @@ export default class LoopUI extends React.Component { <Navbar.Text> <StyledLoginInfo>Signed in as: </StyledLoginInfo> <StyledRouterLink to="/userInfo">{this.state.userName}</StyledRouterLink> - <StyledRouterLink to="/logout/"> (logout)</StyledRouterLink> </Navbar.Text> ); } @@ -281,7 +271,6 @@ export default class LoopUI extends React.Component { <Route path="/undeploy" render={(routeProps) => (<PerformAction {...routeProps} loopAction="undeploy" loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache} showSucAlert={this.showSucAlert} showFailAlert={this.showFailAlert}/>)} /> <Route path="/deploy" render={(routeProps) => (<DeployLoopModal {...routeProps} loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache} showSucAlert={this.showSucAlert} showFailAlert={this.showFailAlert}/>)} /> <Route path="/refreshStatus" render={(routeProps) => (<RefreshStatus {...routeProps} loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache} showSucAlert={this.showSucAlert} showFailAlert={this.showFailAlert}/>)} /> - <Route path="/logout" render={this.logout} /> <GlobalClampStyle /> {this.renderAlertBar()} {this.renderNavBar()} diff --git a/ui-react/src/LoopUI.test.js b/ui-react/src/LoopUI.test.js index 6885e7932..bfd6376e3 100644 --- a/ui-react/src/LoopUI.test.js +++ b/ui-react/src/LoopUI.test.js @@ -83,15 +83,6 @@ describe('Verify LoopUI', () => { expect(historyMock.push.mock.calls[0]).toEqual([ '/']); }) - test('Test logout method', async () => { - const flushPromises = () => new Promise(setImmediate); - const component = shallow(<LoopUI />) - const instance = component.instance(); - instance.logout(); - await flushPromises(); - expect(component.state('userName')).toEqual("testUser"); - }) - test('Test loadLoop method refresh suc', async () => { const historyMock = { push: jest.fn() }; LoopService.getLoop = jest.fn().mockImplementation(() => { diff --git a/ui-react/src/__snapshots__/LoopUI.test.js.snap b/ui-react/src/__snapshots__/LoopUI.test.js.snap index 958e77a99..2dfa48091 100644 --- a/ui-react/src/__snapshots__/LoopUI.test.js.snap +++ b/ui-react/src/__snapshots__/LoopUI.test.js.snap @@ -76,10 +76,6 @@ exports[`Verify LoopUI Test the render method 1`] = ` path="/refreshStatus" render={[Function]} /> - <Route - path="/logout" - render={[Function]} - /> <GlobalStyleComponent /> <div> <Alert @@ -157,11 +153,6 @@ exports[`Verify LoopUI Test the render method 1`] = ` > testUser </Styled(Link)> - <Styled(Link) - to="/logout/" - > - (logout) - </Styled(Link)> </NavbarText> </Navbar> <styled.div> diff --git a/ui-react/src/__snapshots__/OnapClamp.test.js.snap b/ui-react/src/__snapshots__/OnapClamp.test.js.snap index a06f1edfa..56d022fc6 100644 --- a/ui-react/src/__snapshots__/OnapClamp.test.js.snap +++ b/ui-react/src/__snapshots__/OnapClamp.test.js.snap @@ -103,10 +103,6 @@ exports[`Verify OnapClamp Test the render method 1`] = ` path="/refreshStatus" render={[Function]} /> - <Route - path="/logout" - render={[Function]} - /> <GlobalStyleComponent /> <div> <Alert @@ -182,11 +178,6 @@ exports[`Verify OnapClamp Test the render method 1`] = ` <Styled(Link) to="/userInfo" /> - <Styled(Link) - to="/logout/" - > - (logout) - </Styled(Link)> </NavbarText> </Navbar> <styled.div> diff --git a/ui-react/src/api/UserService.js b/ui-react/src/api/UserService.js index 5703fdcc7..477ca4269 100644 --- a/ui-react/src/api/UserService.js +++ b/ui-react/src/api/UserService.js @@ -47,31 +47,6 @@ export default class UserService { return UserService.notLoggedUserName; }); } - - static logout() { - return fetch('/restservices/clds/v1/user/logout', { - method: 'POST', - credentials: 'same-origin' - }) - .then(function (response) { - console.debug("logout response received, status code:", response.status); - if (response.ok) { - return response.text(); - } else { - console.error("logout response is nok"); - return UserService.notLoggedUserName; - } - }) - .then(function (data) { - console.info ("User disconnected:",data) - return data; - }) - .catch(function(error) { - console.warn("logout error received, user set to: ",UserService.notLoggedUserName); - console.error("logout error:",error); - return UserService.notLoggedUserName; - }); - } static getUserInfo() { return fetch('/restservices/clds/v2/clampInformation', { |