Compare commits
14
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ddc238a49d | ||
|
|
4cff613b18 | ||
|
|
4442c2adca | ||
|
|
80262418fd | ||
|
|
a48938982d | ||
|
|
901ca14f44 | ||
|
|
a42ea2bdb4 | ||
|
|
e2026b6a50 | ||
|
|
e83559d151 | ||
|
|
4d43e6ed87 | ||
|
|
bccf14066c | ||
|
|
14f7feda74 | ||
|
|
d5883a855d | ||
|
|
2222bd21b7 |
@@ -31,7 +31,7 @@ on:
|
||||
- '**.js'
|
||||
pull_request:
|
||||
# The branches below must be a subset of the branches above
|
||||
branches: [ release* ]
|
||||
branches: [ trunk ]
|
||||
paths:
|
||||
- '**.java'
|
||||
- '**.js'
|
||||
@@ -51,7 +51,8 @@ jobs:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
#language: [ 'java', 'javascript' ]
|
||||
language: [ 'javascript' ]
|
||||
language: [ 'javascript' ]
|
||||
#language: [ 'javascript' ]
|
||||
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
|
||||
# Learn more:
|
||||
# https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
|
||||
@@ -65,6 +66,7 @@ jobs:
|
||||
uses: github/codeql-action/init@v1
|
||||
with:
|
||||
languages: ${{ matrix.language }}
|
||||
debug: true
|
||||
# If you wish to specify custom queries, you can do so here or in a config file.
|
||||
# By default, queries listed here will override any specified in a config file.
|
||||
# Prefix the list here with "+" to use these queries and those in the config file.
|
||||
@@ -88,4 +90,3 @@ jobs:
|
||||
|
||||
- name: Perform CodeQL Analysis
|
||||
uses: github/codeql-action/analyze@v1
|
||||
|
||||
|
||||
+3
-3
@@ -20,9 +20,9 @@ under the License.
|
||||
= Apache OFBiz®
|
||||
|
||||
image:https://img.shields.io/badge/License-Apache%202.0-blue.svg[link=http://www.apache.org/licenses/LICENSE-2.0]
|
||||
image:https://img.shields.io/badge/Version-release18.12-green.svg[link=Version]
|
||||
image:https://github.com/apache/ofbiz-framework/actions/workflows/gradle.yaml/badge.svg?branch=release18.12[link=https://github.com/apache/ofbiz-framework/actions/workflows/gradle.yaml/badge.svg?branch=release18.12]
|
||||
image:https://github.com/apache/ofbiz-framework/actions/workflows/codeql-analysis.yml/badge.svg?branch=release18.12[link=https://github.com/apache/ofbiz-framework/actions/workflows/codeql-analysis.yml/badge.svg?branch=release18.12]
|
||||
image:https://img.shields.io/badge/Version-release18.12-green.svg[link=https://github.com/apache/ofbiz-framework/tree/release18.12]
|
||||
image:https://github.com/apache/ofbiz-framework/actions/workflows/gradle.yaml/badge.svg?branch=release18.12[link=https://github.com/apache/ofbiz-framework/actions/workflows/gradle.yaml]
|
||||
image:https://github.com/apache/ofbiz-framework/actions/workflows/codeql-analysis.yml/badge.svg?branch=release18.12[link=https://github.com/apache/ofbiz-framework/actions/workflows/codeql-analysis.yml]
|
||||
image:https://qpkb254zxeu.montastic.io/badge[link=https://qpkb254zxeu.montastic.io]
|
||||
|
||||
|
||||
|
||||
+4
-1
@@ -1055,10 +1055,13 @@ public class ProductServices {
|
||||
String fileToCheck = imageServerPath + "/" + fileLocation + "." + extension.getString("fileExtensionId");
|
||||
File file = new File(fileToCheck);
|
||||
try {
|
||||
if (!org.apache.ofbiz.security.SecuredUpload.isValidFile(fileToCheck, "Image", delegator)) {
|
||||
Path tempFile = Files.createTempFile(null, null);
|
||||
Files.write(tempFile, imageData.array(), StandardOpenOption.APPEND);
|
||||
if (!org.apache.ofbiz.security.SecuredUpload.isValidFile(tempFile.toString(), "Image", delegator)) {
|
||||
String errorMessage = UtilProperties.getMessage("SecurityUiLabels", "SupportedImageFormats", locale);
|
||||
return ServiceUtil.returnError(errorMessage);
|
||||
}
|
||||
Files.delete(tempFile);
|
||||
RandomAccessFile out = new RandomAccessFile(fileToCheck, "rw");
|
||||
out.write(imageData.array());
|
||||
out.close();
|
||||
|
||||
+8
-7
@@ -190,7 +190,8 @@ dependencies {
|
||||
compile 'org.apache.geronimo.components:geronimo-transaction:3.1.4'
|
||||
compile 'org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1.1'
|
||||
compile 'org.apache.httpcomponents:httpclient-cache:4.5.6'
|
||||
compile 'org.apache.logging.log4j:log4j-api:2.11.1' // the API of log4j 2
|
||||
compile 'org.apache.logging.log4j:log4j-api:2.17.0' // the API of log4j 2
|
||||
compile 'org.apache.logging.log4j:log4j-web:2.17.0' //???
|
||||
compile 'org.apache.poi:poi:3.17'
|
||||
compile 'org.apache.pdfbox:pdfbox:2.0.24'
|
||||
compile 'org.apache.shiro:shiro-core:1.4.0'
|
||||
@@ -231,11 +232,11 @@ dependencies {
|
||||
runtime 'org.apache.axis2:axis2-transport-local:1.7.8'
|
||||
runtime 'org.apache.derby:derby:10.14.2.0'
|
||||
runtime 'org.apache.geronimo.specs:geronimo-jaxrpc_1.1_spec:1.1'
|
||||
runtime 'org.apache.logging.log4j:log4j-1.2-api:2.11.1' // for external jars using the old log4j1.2: routes logging to log4j 2
|
||||
runtime 'org.apache.logging.log4j:log4j-core:2.11.1' // the implementation of the log4j 2 API
|
||||
runtime 'org.apache.logging.log4j:log4j-jul:2.11.1' // for external jars using the java.util.logging: routes logging to log4j 2
|
||||
runtime 'org.apache.logging.log4j:log4j-slf4j-impl:2.11.1' // for external jars using slf4j: routes logging to log4j 2
|
||||
runtime 'org.apache.logging.log4j:log4j-jcl:2.11.1' // need to constrain to version to avoid classpath conflict (ReflectionUtil)
|
||||
runtime 'org.apache.logging.log4j:log4j-1.2-api:2.17.0' // for external jars using the old log4j1.2: routes logging to log4j 2
|
||||
runtime 'org.apache.logging.log4j:log4j-core:2.17.0' // the implementation of the log4j 2 API
|
||||
runtime 'org.apache.logging.log4j:log4j-jul:2.17.0' // for external jars using the java.util.logging: routes logging to log4j 2
|
||||
runtime 'org.apache.logging.log4j:log4j-slf4j-impl:2.17.0' // for external jars using slf4j: routes logging to log4j 2
|
||||
runtime 'org.apache.logging.log4j:log4j-jcl:2.17.0' // need to constrain to version to avoid classpath conflict (ReflectionUtil)
|
||||
runtime 'org.codeartisans.thirdparties.swing:batik-all:1.8pre-r1084380'
|
||||
|
||||
// plugin libs
|
||||
@@ -296,7 +297,7 @@ sourceSets {
|
||||
resources {
|
||||
srcDirs = getDirectoryInActiveComponentsIfExists('src/main/java')
|
||||
srcDirs += getDirectoryInActiveComponentsIfExists('config')
|
||||
srcDirs += "${rootDir}/framework/base/dtd"
|
||||
srcDirs += getDirectoryInActiveComponentsIfExists('dtd')
|
||||
exclude excludedJavaSources
|
||||
exclude excludedConfigFiles
|
||||
// Below are necessary for unit tests run by Gradle and integration tests
|
||||
|
||||
@@ -67,10 +67,11 @@ under the License.
|
||||
<entity-xml action="assert" entity-xml-url="component://service/testdef/data/ServiceEcaGlobalEventAssertData.xml"/>
|
||||
</test-case>
|
||||
|
||||
<test-case case-name="service-xml-rpc">
|
||||
<!-- This alone should allow Buildbot 3.2 to run the integration tests, cf OFBIZ-12456 -->
|
||||
<!-- <test-case case-name="service-xml-rpc">
|
||||
<junit-test-suite class-name="org.apache.ofbiz.service.test.XmlRpcTests"/>
|
||||
</test-case>
|
||||
<test-case case-name="service-xml-rpc-local-engine">
|
||||
<service-test service-name="testXmlRpcClientAdd"/>
|
||||
</test-case>
|
||||
</test-case!-->
|
||||
</test-suite>
|
||||
|
||||
+1
-1
@@ -3,4 +3,4 @@ Place your custom jar files in here.
|
||||
If you want to use a public open source library, it is recommended
|
||||
that you do not place the library in here. Instead declare it as a
|
||||
dependency in your build scripts (build.gradle files) by finding the
|
||||
appropriate library in jcenter (https://bintray.com/bintray/jcenter)
|
||||
appropriate library in Maven (https://search.maven.org/)
|
||||
|
||||
@@ -695,7 +695,7 @@ Parameter: delegatorName, String, optional - name of the delegator in context.
|
||||
<#macro makeHyperlinkString hiddenFormName imgSrc title alternate linkUrl description linkStyle="" event="" action="" targetParameters="" targetWindow="" confirmation="" uniqueItemName="" height="" width="" id="">
|
||||
<#if uniqueItemName?has_content>
|
||||
<#local params = "{"presentation": "layer"">
|
||||
<#if targetParameters?has_content>
|
||||
<#if targetParameters?has_content && !targetParameters?is_hash>
|
||||
<#local parameterMap = targetParameters?eval>
|
||||
<#local parameterKeys = parameterMap?keys>
|
||||
<#list parameterKeys as key>
|
||||
|
||||
Reference in New Issue
Block a user