Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 616daacba424
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3d618f045bf4
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Jun 1, 2017

  1. Also allow access control to trigger quiet bail out of jar index. 

    Fixes #4633.
    @headius
    headius committed Jun 1, 2017
    Copy the full SHA
    042f98b View commit details

Commits on Jun 13, 2017

  1. Merge pull request #4640 from headius/jarindex_security 

    Also allow access control to trigger quiet bail out of jar index.
    @headius
    headius authored Jun 13, 2017
    Copy the full SHA
    3d618f0 View commit details
Showing with 4 additions and 0 deletions.
  1. +4 −0 core/src/main/java/org/jruby/util/JarCache.java
4 changes: 4 additions & 0 deletions core/src/main/java/org/jruby/util/JarCache.java
View file
Original file line number Diff line number Diff line change
@@ -4,6 +4,7 @@
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.security.AccessControlException;
import java.util.Collections;
import java.util.Enumeration;
import java.util.HashMap;
@@ -147,6 +148,9 @@ public JarIndex getIndex(String jarPath) {
indexCache.put(cacheKey, index);
} catch (IOException ioe) {
return null;
} catch (AccessControlException ace) {
// No permissions to index the given path, bail out
return null;
}
}