mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-27 19:05:38 +02:00
Code Issues Wiki Activity

Bug 449306: Unnecessary access to secure storage by JSchConnection

Browse source 
Change-Id: I7e2372e9e059b71d69676d6c0fe3aba71057a009
Signed-off-by: Markus Schorn <markus.schorn@windriver.com>
This commit is contained in:
Markus Schorn 2014-11-04 14:42:28 +01:00
parent c563ea3f0e
commit c096be5127
2 changed files with 42 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/JSchConnectionAttributes.java
View file

@ -1,12 +1,13 @@
/*******************************************************************************
* Copyright (c) 2013 IBM Corporation and others.
* Copyright (c) 2013, 2014 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
* IBM Corporation - Initial API and implementation
* IBM Corporation - Initial API and implementation
* Markus Schorn - Bug 449306: Unnecessary access to secure storage.
*******************************************************************************/
package org.eclipse.remote.internal.jsch.core;
@ -45,6 +46,8 @@ public class JSchConnectionAttributes {
private final Map<String, String> fAttributes = Collections.synchronizedMap(new HashMap<String, String>());
private final Map<String, String> fSecureAttributes = Collections.synchronizedMap(new HashMap<String, String>());
private boolean fSecureAttributesLoaded;
public JSchConnectionAttributes(String name) {
fName = name;
load();
@ -62,7 +65,7 @@ public class JSchConnectionAttributes {
public JSchConnectionAttributes copy() {
JSchConnectionAttributes copy = new JSchConnectionAttributes(fName);
copy.getAttributes().putAll(fAttributes);
copy.getSecureAttributes().putAll(fSecureAttributes);
copy.setSecureAttributes(getSecureAttributes());
return copy;
}
@ -119,6 +122,7 @@ public class JSchConnectionAttributes {
}
public String getSecureAttribute(String key, String def) {
loadSecureAttributes();
if (fSecureAttributes.containsKey(key)) {
return fSecureAttributes.get(key);
}
@ -126,8 +130,15 @@ public class JSchConnectionAttributes {
}
public Map<String, String> getSecureAttributes() {
loadSecureAttributes();
return fSecureAttributes;
}
void setSecureAttributes(Map<String, String> secureAttributes) {
fSecureAttributes.clear();
fSecureAttributes.putAll(secureAttributes);
fSecureAttributesLoaded = true;
}
private ISecurePreferences getSecurePreferences() {
ISecurePreferences secRoot = SecurePreferencesFactory.getDefault();
@ -144,14 +155,7 @@ public class JSchConnectionAttributes {
} catch (BackingStoreException e) {
Activator.log(e.getMessage());
}
ISecurePreferences secRoot = SecurePreferencesFactory.getDefault();
ISecurePreferences secConnections = secRoot.node(CONNECTIONS_KEY);
ISecurePreferences secNode = secConnections.node(fName);
try {
loadAuthAttributes(secNode);
} catch (StorageException e) {
Activator.log(e.getMessage());
}
fSecureAttributesLoaded = false;
}
private void loadAttributes(Preferences node) throws BackingStoreException {
@ -161,11 +165,20 @@ public class JSchConnectionAttributes {
}
}
private void loadAuthAttributes(ISecurePreferences node) throws StorageException {
fSecureAttributes.clear();
for (String key : node.keys()) {
fSecureAttributes.put(key, node.get(key, null));
private void loadSecureAttributes() {
if (fSecureAttributesLoaded)
return;
ISecurePreferences secNode = getSecurePreferences();
try {
fSecureAttributes.clear();
for (String key : secNode.keys()) {
fSecureAttributes.put(key, secNode.get(key, null));
}
} catch (StorageException e) {
Activator.log(e.getMessage());
}
fSecureAttributesLoaded = true;
}
public void remove() {
@ -190,15 +203,17 @@ public class JSchConnectionAttributes {
node.put(entry.getKey(), entry.getValue());
}
}
try {
ISecurePreferences secNode = getSecurePreferences();
synchronized (fSecureAttributes) {
for (Entry<String, String> entry : fSecureAttributes.entrySet()) {
secNode.put(entry.getKey(), entry.getValue(), true);
if (fSecureAttributesLoaded) {
try {
ISecurePreferences secNode = getSecurePreferences();
synchronized (fSecureAttributes) {
for (Entry<String, String> entry : fSecureAttributes.entrySet()) {
secNode.put(entry.getKey(), entry.getValue(), true);
}
}
} catch (StorageException e) {
Activator.log(e.getMessage());
}
} catch (StorageException e) {
Activator.log(e.getMessage());
}
}
@ -211,6 +226,7 @@ public class JSchConnectionAttributes {
}
public void setSecureAttribute(String key, String value) {
loadSecureAttributes();
fSecureAttributes.put(key, value);
}
}

8
bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/JSchConnectionWorkingCopy.java
View file

@ -1,12 +1,13 @@
/*******************************************************************************
* Copyright (c) 2007, 2010 IBM Corporation and others.
* Copyright (c) 2007, 2010, 2014 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
* IBM Corporation - Initial API and implementation
* IBM Corporation - Initial API and implementation
* Markus Schorn - Bug 449306: Unnecessary access to secure storage.
*******************************************************************************/
package org.eclipse.remote.internal.jsch.core;
@ -187,8 +188,7 @@ public class JSchConnectionWorkingCopy extends JSchConnection implements IRemote
JSchConnectionAttributes info = fOriginal.getInfo();
info.getAttributes().clear();
info.getAttributes().putAll(fWorkingAttributes.getAttributes());
info.getSecureAttributes().clear();
info.getSecureAttributes().putAll(fWorkingAttributes.getSecureAttributes());
info.setSecureAttributes(fWorkingAttributes.getSecureAttributes());
if (!getName().equals(info.getName())) {
info.setName(getName());
getManager().remove(fOriginal);