Skip to content

Commit 2b53b42

Browse files
lmajanolmajano
committed
Merge branch 'development'
2 parents d9850ab + d215c12 commit 2b53b42

File tree

15 files changed

+134
-262
lines changed

15 files changed

+134
-262
lines changed

‎.module.properties‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
project.name=cbjavaloader
2+
project.version=1.3.2
3+
module.name=cbjavaloader

‎.travis.yml‎

Lines changed: 70 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,28 @@
11
language: java
22

3+
notifications:
4+
slack:
5+
secure: FIHlTn/YO7Wgumm1uIqmoEsqjQA7fV0AE94Rjc5yKzM3AquQa8HicgDVVk0d2GrKRnl0xt3j4ZJV//VJyIjlCd/QVKuj48R2ChjEY2im3+99HFPafCUI5/S2uyowKU6mJTFonH9v6p41eqxdbiAxJdDGOT0V2Gpt3UBSNuHz8ED9/aIHqv+P7M+VD6Xd2XYwctPniWlaSWx57sWcnG/VkFG45qFQAyha64uxOOe4M3ZmG/n5FfauZ8cBVLiRKEIr+CyNhh1ujfzi7+4uzMlSNL5t/BbZamAQuZzqGzGQ9RVvIlyPgUGNJtDEE/hWS09aagXF5T6EMj00szizErh4J1/x4qZwml5+TcBN31E0QmAhCtZe85sr3tYgic+hEz9XX1yymQzf/C7n4to2yNvq0r4g51xDk8IuP95WEh7zaqLlvFZvBFgxpHZBMYlRvhytjOYDeIFRMcGwHZcXosaG2ejqDwcGq/LC4oeG4sSwmg9sdRrtcmcanrNqrBka86WYO6LntI3JdZ86/1ACEUHzhCCwvrKELc9Ji1xxGAgS7QKH+s2/hnJuiMyv73gOVLKYC+wPMLt+fvOmPLSEl+PJiAIlToBq1KUBg03RSQLfPOLD7OrJ8VvDZsEPwejqlGDyc4wRglS9OTi7SnN5LYHSDNDdGdREegWqq9qDHEYEVLI=
6+
7+
env:
8+
global:
9+
- MODULE_ID=cbjavaloader
10+
matrix:
11+
- [email protected]
12+
- ENGINE=lucee@5
13+
- ENGINE=adobe@10
14+
- ENGINE=adobe@11
15+
- ENGINE=adobe@2016
16+
317
branches:
418
only:
519
- development
620
- master
721

8-
sudo: required
9-
1022
dist: trusty
1123

24+
sudo: required
25+
1226
before_install:
1327
# CommandBox Keys
1428
- sudo apt-key adv --keyserver keys.gnupg.net --recv 6DA70622
@@ -17,46 +31,71 @@ before_install:
1731

1832
install:
1933
# Install Commandbox
20-
- sudo apt-get update && sudo apt-get --assume-yes install commandbox
34+
- sudo apt-get update && sudo apt-get --assume-yes install rsync jq commandbox
2135
# Test that the box binary is available and ready for our tests
2236
- box version
23-
# Install Dependencies
24-
- box install
25-
# Store the Ortus API Key for forgebox publishing in `master`
37+
# If using auto-publish, you will need to provide your API token with this line:
2638
- box config set endpoints.forgebox.APIToken=$FORGEBOX_API_TOKEN > /dev/null
27-
# Startup Server
28-
- box server start
39+
# Setup for our tests
40+
- mkdir tests/results
41+
- sudo chmod -R 775 tests/results
2942

43+
# Build script - note module versioning is passed to ANT
3044
script:
31-
# Execute build via ANT
32-
- ant -DisTravis=true -Dbuild.number=$TRAVIS_BUILD_NUMBER -f workbench/build.xml
33-
#- curl http://localhost:49616/tests/runner.cfm > log.html && cat log.html
34-
# Spit out log just in case we need to debug
35-
- box server log
45+
# run our dependency install to ensure the workbench is in place
46+
- box install
47+
# add our module-specific build properties
48+
- printf "\nmodule.name=$MODULE_ID" >> workbench/build.properties
49+
- printf "\ncfengine=$ENGINE" >> workbench/build.properties
50+
# execute our build
51+
- ant -DisTravis=true -Dbuild.number=$TRAVIS_BUILD_NUMBER -Dbuild.branch=$TRAVIS_BRANCH -f workbench/build.xml
52+
53+
after_failure:
54+
- cd $TRAVIS_BUILD_DIR
55+
# Display the contents of our root directory
56+
# Spit out our Commandbox log in case we need to debug
57+
- box server log name=$ENGINE
58+
- cat `box system-log`
3659

3760
# Only executed when merging to master
3861
before_deploy:
39-
- mkdir s3deploy
40-
- cp -r ./artifacts/cbjavaloader/* ./s3deploy/
62+
- cd $TRAVIS_BUILD_DIR
63+
- mkdir -p s3deploy
64+
- rsync -av ./artifacts/$MODULE_ID/ ./s3deploy/
4165
- rm -f ./s3deploy/box-repo.json
4266

4367
deploy:
44-
on:
45-
branch:
46-
- master
47-
skip_cleanup: true
48-
provider: s3
49-
#AWS Credentials need to be set in Travis
50-
access_key_id: $AWS_ACCESS_KEY
51-
secret_access_key: $AWS_ACCESS_SECRET
52-
bucket: "downloads.ortussolutions.com"
53-
local-dir: s3deploy
54-
upload-dir: ortussolutions/coldbox-modules/cbjavaloader
55-
acl: public_read
68+
#Module Deployment
69+
- provider: s3
70+
on:
71+
branch:
72+
- master
73+
- development
74+
condition: "$ENGINE = [email protected]"
75+
skip_cleanup: true
76+
#AWS Credentials need to be set in Travis
77+
access_key_id: $AWS_ACCESS_KEY
78+
secret_access_key: $AWS_ACCESS_SECRET
79+
bucket: "downloads.ortussolutions.com"
80+
local-dir: s3deploy
81+
upload-dir: ortussolutions/coldbox-modules/$MODULE_ID
82+
acl: public_read
83+
#API Docs Deployment
84+
- provider: s3
85+
on:
86+
branch:
87+
- master
88+
- development
89+
condition: "$ENGINE = [email protected]"
90+
skip_cleanup: true
91+
#AWS Credentials need to be set in Travis
92+
access_key_id: $AWS_ACCESS_KEY
93+
secret_access_key: $AWS_ACCESS_SECRET
94+
bucket: "apidocs.ortussolutions.com"
95+
local-dir: build/apidocs
96+
upload-dir: coldbox-modules/$MODULE_ID
97+
acl: public_read
98+
5699

57100
after_deploy:
58101
- cd $TRAVIS_BUILD_DIR/build && box forgebox publish
59-
60-
notifications:
61-
slack:
62-
secure: FIHlTn/YO7Wgumm1uIqmoEsqjQA7fV0AE94Rjc5yKzM3AquQa8HicgDVVk0d2GrKRnl0xt3j4ZJV//VJyIjlCd/QVKuj48R2ChjEY2im3+99HFPafCUI5/S2uyowKU6mJTFonH9v6p41eqxdbiAxJdDGOT0V2Gpt3UBSNuHz8ED9/aIHqv+P7M+VD6Xd2XYwctPniWlaSWx57sWcnG/VkFG45qFQAyha64uxOOe4M3ZmG/n5FfauZ8cBVLiRKEIr+CyNhh1ujfzi7+4uzMlSNL5t/BbZamAQuZzqGzGQ9RVvIlyPgUGNJtDEE/hWS09aagXF5T6EMj00szizErh4J1/x4qZwml5+TcBN31E0QmAhCtZe85sr3tYgic+hEz9XX1yymQzf/C7n4to2yNvq0r4g51xDk8IuP95WEh7zaqLlvFZvBFgxpHZBMYlRvhytjOYDeIFRMcGwHZcXosaG2ejqDwcGq/LC4oeG4sSwmg9sdRrtcmcanrNqrBka86WYO6LntI3JdZ86/1ACEUHzhCCwvrKELc9Ji1xxGAgS7QKH+s2/hnJuiMyv73gOVLKYC+wPMLt+fvOmPLSEl+PJiAIlToBq1KUBg03RSQLfPOLD7OrJ8VvDZsEPwejqlGDyc4wRglS9OTi7SnN5LYHSDNDdGdREegWqq9qDHEYEVLI=

‎box.json‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,25 @@
11
{
22
"name":"cbjavaloader Builder",
3-
"version":"1.0.0",
3+
"version":"1.3.2",
44
"slug":"cbjavaloader-shell",
55
"private":false,
66
"defaultPort":0,
77
"dependencies":{
8-
"coldbox":"^4.3.0"
8+
"coldbox":"^4.3.0",
9+
"workbench":"git+https://github.com/Ortus-Solutions/unified-workbench.git"
910
},
1011
"devDependencies":{
1112
"testbox":"^2.4.0+80"
1213
},
1314
"installPaths":{
1415
"coldbox":"coldbox",
15-
"testbox":"testbox"
16+
"testbox":"testbox",
17+
"workbench":"workbench"
18+
},
19+
"testbox":{
20+
"runner":"http://localhost:49616"
21+
},
22+
"scripts":{
23+
"postVersion":"recipe workbench/bump.boxr"
1624
}
1725
}

‎changelog.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
CHANGELOG
22
=========
33

4+
## 1.3.2
5+
* Removal of security issues with Javaloader `tags` directory
6+
* Securing execution of Javaloader models
7+
* Updated to unified workbench
8+
49
## 1.3.1
510
* Travis Update Builds
611
* Adobe CF 2016,11,10 compatiblity fixes

‎config/Coldbox.cfc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ component{
66
// coldbox directives
77
coldbox = {
88
//Application Setup
9-
appName = "App Shell",
9+
appName = "Development Shell",
1010

1111
//Development Settings
1212
reinitPassword = "",

‎modules/cbjavaloader/ModuleConfig.cfc‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ component {
1515
this.viewParentLookup = true;
1616
// If true, looks for layouts in the parent first, if not found, then in module. Else vice-versa
1717
this.layoutParentLookup = true;
18-
// Module Entry Point
19-
this.entryPoint = "cbjavaloader";
2018
// CF Mapping
2119
this.cfmapping = "cbjavaloader";
2220

‎modules/cbjavaloader/models/javaloader/Application.cfc‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
component{
2+
abort;
3+
}

‎modules/cbjavaloader/models/javaloader/JavaLoader.cfc‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ Purpose: Utlitity class for loading Java Classes
1717
instance.static.uuid = "A0608BEC-0AEB-B46A-0E1E1EC5F3CE7C9C";
1818
</cfscript>
1919

20-
<cfimport taglib="tags" prefix="jl">
21-
2220
<!------------------------------------------- PUBLIC ------------------------------------------->
2321

2422
<cffunction name="init" hint="Constructor" access="public" returntype="JavaLoader" output="false">
@@ -259,7 +257,11 @@ Purpose: Utlitity class for loading Java Classes
259257
<!--- cf7 syntax. Yuck. --->
260258
<cfloop from="1" to="#len#" index="counter">
261259
<cfset dir = directories[counter]>
262-
<jl:directory action="list" directory="#dir#" recurse="true"
260+
261+
<cfdirectory
262+
action="list"
263+
directory="#dir#"
264+
recurse="true"
263265
type="file"
264266
sort="dateLastModified desc"
265267
name="qLastModified">

‎modules/cbjavaloader/models/javaloader/tags/directory.cfm‎

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎tests/test.properties‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
1-
url.runner=http://localhost:49616/tests/runner.cfm?
1+
url.runners.lucee@4.5=http://127.0.0.1:50680/tests/runner.cfm?
2+
url.runners.lucee@5=http://127.0.0.1:50685/tests/runner.cfm?
3+
url.runners.adobe@10=http://127.0.0.1:49610/tests/runner.cfm?
4+
url.runners.adobe@11=http://127.0.0.1:49611/tests/runner.cfm?
5+
url.runners.adobe@2016=http://127.0.0.1:49616/tests/runner.cfm?

0 commit comments

Comments
 (0)