You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by hu...@apache.org on 2014/09/24 09:07:42 UTC
[1/5] git commit: updated refs/heads/master to 3a5401f
Repository: cloudstack
Updated Branches:
refs/heads/master 2503aaafe -> 3a5401f8f
CID-1240106 Remove unused variable
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9ead2046
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9ead2046
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9ead2046
Branch: refs/heads/master
Commit: 9ead2046d495db6af496656c1f69ae1dc1a1d1a2
Parents: 49de3ab
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Tue Sep 23 11:02:40 2014 +0200
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Tue Sep 23 11:02:40 2014 +0200
----------------------------------------------------------------------
server/src/com/cloud/template/TemplateManagerImpl.java | 5 -----
1 file changed, 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9ead2046/server/src/com/cloud/template/TemplateManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/template/TemplateManagerImpl.java b/server/src/com/cloud/template/TemplateManagerImpl.java
index 247ed00..a1ca344 100755
--- a/server/src/com/cloud/template/TemplateManagerImpl.java
+++ b/server/src/com/cloud/template/TemplateManagerImpl.java
@@ -629,13 +629,10 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager,
// Event details
String copyEventType;
- String createEventType;
if (template.getFormat().equals(ImageFormat.ISO)) {
copyEventType = EventTypes.EVENT_ISO_COPY;
- createEventType = EventTypes.EVENT_ISO_CREATE;
} else {
copyEventType = EventTypes.EVENT_TEMPLATE_COPY;
- createEventType = EventTypes.EVENT_TEMPLATE_CREATE;
}
TemplateInfo srcTemplate = _tmplFactory.getTemplate(template.getId(), srcSecStore);
@@ -1493,8 +1490,6 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager,
@Override
@ActionEvent(eventType = EventTypes.EVENT_TEMPLATE_CREATE, eventDescription = "creating template", create = true)
public VMTemplateVO createPrivateTemplateRecord(CreateTemplateCmd cmd, Account templateOwner) throws ResourceAllocationException {
- Long userId = CallContext.current().getCallingUserId();
-
Account caller = CallContext.current().getCallingAccount();
boolean isAdmin = (_accountMgr.isAdmin(caller.getId()));
[4/5] git commit: updated refs/heads/master to 3a5401f
Posted by hu...@apache.org.
Merge branch 'bugfix/CID-1232333'
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5a6ff416
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5a6ff416
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5a6ff416
Branch: refs/heads/master
Commit: 5a6ff416894c3bf634c9eb658f47f1d201831c9d
Parents: 2503aaa 9eb2b27
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Wed Sep 24 09:07:05 2014 +0200
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Wed Sep 24 09:07:05 2014 +0200
----------------------------------------------------------------------
.../service/controller/s3/S3BucketAction.java | 96 ++++++++++----------
1 file changed, 47 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
[5/5] git commit: updated refs/heads/master to 3a5401f
Posted by hu...@apache.org.
Merge branch 'bugfix/CID-1240106'
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3a5401f8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3a5401f8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3a5401f8
Branch: refs/heads/master
Commit: 3a5401f8f9a940d26f5dc7a970802f299e713f61
Parents: 5a6ff41 c20336c
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Wed Sep 24 09:07:20 2014 +0200
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Wed Sep 24 09:07:20 2014 +0200
----------------------------------------------------------------------
.../cloud/hypervisor/kvm/resource/LibvirtComputingResource.java | 4 ++--
server/src/com/cloud/template/TemplateManagerImpl.java | 5 -----
2 files changed, 2 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
[2/5] git commit: updated refs/heads/master to 3a5401f
Posted by hu...@apache.org.
CID-1240107 Remove unused variable
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c20336c1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c20336c1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c20336c1
Branch: refs/heads/master
Commit: c20336c1ab45ba7b046b1064a8c10d8e405055ee
Parents: 9ead204
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Tue Sep 23 11:06:41 2014 +0200
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Tue Sep 23 11:06:41 2014 +0200
----------------------------------------------------------------------
.../cloud/hypervisor/kvm/resource/LibvirtComputingResource.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c20336c1/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
index a79526a..1dc1955 100755
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@ -230,8 +230,8 @@ import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.InterfaceDef;
import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.InterfaceDef.guestNetType;
import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.SerialDef;
import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.TermPolicy;
-import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.VirtioSerialDef;
import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.VideoDef;
+import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.VirtioSerialDef;
import com.cloud.hypervisor.kvm.storage.KVMPhysicalDisk;
import com.cloud.hypervisor.kvm.storage.KVMStoragePool;
import com.cloud.hypervisor.kvm.storage.KVMStoragePoolManager;
@@ -5261,7 +5261,7 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
String device = Script.runSimpleBashScript("rbd showmapped | grep \""+splitPoolImage[0]+"[ ]*"+splitPoolImage[1]+"\" | grep -o \"[^ ]*[ ]*$\"");
if(device == null) {
//If not mapped, map and return mapped device
- String mapRbd = Script.runSimpleBashScript("rbd map " + disk.getPath() + " --id "+pool.getAuthUserName());
+ Script.runSimpleBashScript("rbd map " + disk.getPath() + " --id " + pool.getAuthUserName());
device = Script.runSimpleBashScript("rbd showmapped | grep \""+splitPoolImage[0]+"[ ]*"+splitPoolImage[1]+"\" | grep -o \"[^ ]*[ ]*$\"");
}
return device;
[3/5] git commit: updated refs/heads/master to 3a5401f
Posted by hu...@apache.org.
Fix for CID-1232333, CID-1232334, CID-1232335, CID-1232336 and
CID-1232337
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9eb2b276
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9eb2b276
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9eb2b276
Branch: refs/heads/master
Commit: 9eb2b2763c2e42eb123969173b0399678ff4d50b
Parents: 49de3ab
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Tue Sep 23 11:23:20 2014 +0200
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Tue Sep 23 11:23:20 2014 +0200
----------------------------------------------------------------------
.../service/controller/s3/S3BucketAction.java | 96 ++++++++++----------
1 file changed, 47 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9eb2b276/awsapi/src/com/cloud/bridge/service/controller/s3/S3BucketAction.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/controller/s3/S3BucketAction.java b/awsapi/src/com/cloud/bridge/service/controller/s3/S3BucketAction.java
index 788f35a..6f6f12f 100644
--- a/awsapi/src/com/cloud/bridge/service/controller/s3/S3BucketAction.java
+++ b/awsapi/src/com/cloud/bridge/service/controller/s3/S3BucketAction.java
@@ -35,6 +35,7 @@ import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.stream.XMLStreamException;
+import org.apache.commons.lang.StringEscapeUtils;
import org.apache.log4j.Logger;
import org.json.simple.parser.ParseException;
import org.w3c.dom.Document;
@@ -43,7 +44,6 @@ import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import com.amazon.s3.GetBucketAccessControlPolicyResponse;
-import com.amazon.s3.ListAllMyBucketsResponse;
import com.amazon.s3.ListBucketResponse;
import com.cloud.bridge.io.MTOMAwareResultStreamWriter;
@@ -327,18 +327,18 @@ public class S3BucketAction implements ServletAction {
S3PolicyContext context = new S3PolicyContext(PolicyActions.PutBucketPolicy, bucketName);
switch (S3Engine.verifyPolicy(context)) {
- case ALLOW:
- break;
+ case ALLOW:
+ break;
- case DEFAULT_DENY:
- if (null != owner && !client.equals(owner)) {
- response.setStatus(405);
- return;
- }
- break;
- case DENY:
- response.setStatus(403);
+ case DEFAULT_DENY:
+ if (null != owner && !client.equals(owner)) {
+ response.setStatus(405);
return;
+ }
+ break;
+ case DENY:
+ response.setStatus(403);
+ return;
}
TransactionLegacy txn = TransactionLegacy.open(TransactionLegacy.AWSAPI_DB);
// [B] Place the policy into the database over writting an existing policy
@@ -394,19 +394,19 @@ public class S3BucketAction implements ServletAction {
String client = UserContext.current().getCanonicalUserId();
S3PolicyContext context = new S3PolicyContext(PolicyActions.GetBucketPolicy, bucketName);
switch (S3Engine.verifyPolicy(context)) {
- case ALLOW:
- break;
-
- case DEFAULT_DENY:
- if (null != owner && !client.equals(owner)) {
- response.setStatus(405);
- return;
- }
- break;
+ case ALLOW:
+ break;
- case DENY:
- response.setStatus(403);
+ case DEFAULT_DENY:
+ if (null != owner && !client.equals(owner)) {
+ response.setStatus(405);
return;
+ }
+ break;
+
+ case DENY:
+ response.setStatus(403);
+ return;
}
// [B] Pull the policy from the database if one exists
@@ -463,10 +463,9 @@ public class S3BucketAction implements ServletAction {
S3ListAllMyBucketsResponse engineResponse = ServiceProvider.getInstance().getS3Engine().handleRequest(engineRequest);
- // To allow the all buckets list to be serialized via Axiom classes
- ListAllMyBucketsResponse allBuckets = S3SerializableServiceImplementation.toListAllMyBucketsResponse(engineResponse);
+ S3SerializableServiceImplementation.toListAllMyBucketsResponse(engineResponse);
- OutputStream outputStream = response.getOutputStream();
+ response.getOutputStream();
response.setStatus(200);
response.setContentType("application/xml");
// The content-type literally should be "application/xml; charset=UTF-8"
@@ -531,15 +530,14 @@ public class S3BucketAction implements ServletAction {
StringBuffer xmlError = new StringBuffer();
xmlError.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>")
- .append("<Error><Code>NoSuchBucket</Code><Message>The specified bucket does not exist</Message>")
- .append("<BucketName>")
- .append((String)request.getAttribute(S3Constants.BUCKET_ATTR_KEY))
- .append("</BucketName>")
- .append("<RequestId>1DEADBEEF9</RequestId>")
- // TODO
- .append("<HostId>abCdeFgHiJ1k2LmN3op4q56r7st89</HostId>")
- // TODO
- .append("</Error>");
+ .append("<Error><Code>NoSuchBucket</Code><Message>The specified bucket does not exist</Message>")
+ .append("<BucketName>").append(StringEscapeUtils.escapeHtml((String)request.getAttribute(S3Constants.BUCKET_ATTR_KEY)))
+ .append("</BucketName>")
+ .append("<RequestId>1DEADBEEF9</RequestId>")
+ // TODO
+ .append("<HostId>abCdeFgHiJ1k2LmN3op4q56r7st89</HostId>")
+ // TODO
+ .append("</Error>");
S3RestServlet.endResponse(response, xmlError.toString());
}
@@ -603,16 +601,16 @@ public class S3BucketAction implements ServletAction {
// [C]
switch (sbucket.getVersioningStatus()) {
- default:
- case 0:
- versioningStatus = "";
- break;
- case 1:
- versioningStatus = "Enabled";
- break;
- case 2:
- versioningStatus = "Suspended";
- break;
+ default:
+ case 0:
+ versioningStatus = "";
+ break;
+ case 1:
+ versioningStatus = "Enabled";
+ break;
+ case 2:
+ versioningStatus = "Suspended";
+ break;
}
StringBuffer xml = new StringBuffer();
@@ -656,7 +654,7 @@ public class S3BucketAction implements ServletAction {
if (null == versionIdMarker)
xml.append("<VersionIdMarker/>");
else
- xml.append("<VersionIdMarker>").append(keyMarker).append("</VersionIdMarker");
+ xml.append("<VersionIdMarker>").append(StringEscapeUtils.escapeHtml(keyMarker)).append("</VersionIdMarker");
xml.append("<MaxKeys>").append(engineResponse.getMaxKeys()).append("</MaxKeys>");
xml.append("<IsTruncated>").append(engineResponse.isTruncated()).append("</IsTruncated>");
@@ -773,7 +771,7 @@ public class S3BucketAction implements ServletAction {
} catch (ObjectAlreadyExistsException oaee) {
response.setStatus(409);
String xml =
- "<?xml version=\"1.0\" encoding=\"UTF-8\"?> <Error><Code>OperationAborted</Code><Message>A conflicting conditional operation is currently in progress against this resource. Please try again..</Message>";
+ "<?xml version=\"1.0\" encoding=\"UTF-8\"?> <Error><Code>OperationAborted</Code><Message>A conflicting conditional operation is currently in progress against this resource. Please try again..</Message>";
response.setContentType("text/xml; charset=UTF-8");
S3RestServlet.endResponse(response, xml.toString());
}
@@ -969,7 +967,7 @@ public class S3BucketAction implements ServletAction {
xml.append("<?xml version=\"1.0\" encoding=\"utf-8\"?>");
xml.append("<ListMultipartUploadsResult xmlns=\"http://s3.amazonaws.com/doc/2006-03-01/\">");
xml.append("<Bucket>").append(bucketName).append("</Bucket>");
- xml.append("<KeyMarker>").append((null == keyMarker ? "" : keyMarker)).append("</KeyMarker>");
+ xml.append("<KeyMarker>").append((null == keyMarker ? "" : StringEscapeUtils.escapeHtml(keyMarker))).append("</KeyMarker>");
xml.append("<UploadIdMarker>").append((null == uploadIdMarker ? "" : uploadIdMarker)).append("</UploadIdMarker>");
// [C] Construct the contents of the <Upload> element
@@ -1015,9 +1013,9 @@ public class S3BucketAction implements ServletAction {
partsList.append("<CommonPrefixes>");
partsList.append("<Prefix>");
if (prefix != null && prefix.length() > 0)
- partsList.append(prefix + delimiter + subName);
+ partsList.append(StringEscapeUtils.escapeHtml(prefix) + StringEscapeUtils.escapeHtml(delimiter) + StringEscapeUtils.escapeHtml(subName));
else
- partsList.append(subName);
+ partsList.append(StringEscapeUtils.escapeHtml(subName));
partsList.append("</Prefix>");
partsList.append("</CommonPrefixes>");
}