Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-02-17 08:00:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

GP-1326: Upgrading Apache Felix to 7.0.1

Browse Source
This commit is contained in:
Ryan Kurtz 2021-10-05 13:55:43 -04:00
parent 91f94b8155
commit 79dad2acf0
3 changed files with 2 additions and 194 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Ghidra/Features/Base/Module.manifest
View File

@ -1,7 +1,7 @@
MODULE FILE LICENSE: lib/biz.aQute.bndlib-5.1.2.jar Apache License 2.0
MODULE FILE LICENSE: lib/slf4j-api-1.7.25.jar MIT
MODULE FILE LICENSE: lib/slf4j-nop-1.7.25.jar MIT
MODULE FILE LICENSE: lib/org.apache.felix.framework-6.0.3.jar Apache License 2.0
MODULE FILE LICENSE: lib/org.apache.felix.framework-7.0.1.jar Apache License 2.0
MODULE FILE LICENSE: lib/animal-sniffer-annotations-1.9.jar MIT
MODULE FILE LICENSE: lib/org.osgi.core-5.0.0.jar Apache License 2.0
MODULE FILE LICENSE: lib/phidias-0.3.7.jar Apache License 2.0

2
Ghidra/Features/Base/build.gradle
View File

@ -46,7 +46,7 @@ dependencies {
api project(':DB')
api project(':Help')
api 'org.apache.felix:org.apache.felix.framework:6.0.3'
api 'org.apache.felix:org.apache.felix.framework:7.0.1'
api 'com.github.rotty3000:phidias:0.3.7'
api 'biz.aQute.bnd:biz.aQute.bndlib:5.1.2'
api 'org.slf4j:slf4j-api:1.7.25'

192
Ghidra/Features/Base/src/main/java/org/apache/felix/framework/util/MultiReleaseContent.java
View File

@ -1,192 +0,0 @@
/* ###
* IP: Apache License 2.0
*/
/***
* This is fix for a bug found in the Felix Framework:
*
* https://issues.apache.org/jira/browse/FELIX-6297
*
* Because of its place on the classpath, this class overrides felix's.
*
* THIS FILE SHOULD BE REMOVED WHEN THE ISSUE IS ADDRESSED.
*
***
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.felix.framework.util;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import java.util.*;
import java.util.jar.Manifest;
import org.apache.felix.framework.cache.Content;
import org.osgi.framework.Version;
public class MultiReleaseContent implements Content
{
private final Content m_content;
private final int m_javaVersion;
MultiReleaseContent(int javaVersion, Content content)
{
m_javaVersion = javaVersion;
m_content = content;
}
public static Content wrap(String javaVersionString, Content content)
{
int javaVersion = 8;
try
{
javaVersion = Version.parseVersion(javaVersionString).getMajor();
}
catch (Exception ex)
{
}
if (javaVersion > 8)
{
try
{
try (InputStream manifestStream = content.getEntryAsStream("META-INF/MANIFEST.MF"))
{
if (manifestStream != null)
{
if ("true".equals(new Manifest(manifestStream).getMainAttributes().getValue("Multi-Release")))
{
content = new MultiReleaseContent(javaVersion, content);
}
}
}
}
catch (Exception ex)
{
}
}
return content;
}
@Override
public void close()
{
m_content.close();
}
@Override
public boolean hasEntry(String name)
{
return m_content.hasEntry(findPath(name));
}
@Override
public Enumeration<String> getEntries()
{
Enumeration<String> entries = m_content.getEntries();
if (entries != null)
{
Set<String> result = new LinkedHashSet<String>();
while (entries.hasMoreElements())
{
String path = entries.nextElement();
result.add(path);
String internalPath = path;
while (internalPath.startsWith("/"))
{
internalPath = internalPath.substring(1);
}
if (internalPath.startsWith("META-INF/versions/") )
{
int idx = internalPath.indexOf('/', "META-INF/versions/".length());
if ((idx != -1) && (idx + 1) < internalPath.length())
{
int version = Version.parseVersion(internalPath.substring("META-INF/versions/".length(), idx)).getMajor();
if ((version > 8) && (version <= m_javaVersion))
{
internalPath = internalPath.substring(idx + 1);
if (!internalPath.startsWith("META-INF/"))
{
result.add(internalPath);
}
}
}
}
}
return Collections.enumeration(result);
}
else
{
return entries;
}
}
@Override
public byte[] getEntryAsBytes(String name)
{
return m_content.getEntryAsBytes(findPath(name));
}
@Override
public InputStream getEntryAsStream(String name) throws IOException
{
return m_content.getEntryAsStream(findPath(name));
}
@Override
public Content getEntryAsContent(String name)
{
return m_content.getEntryAsContent(findPath(name));
}
@Override
public String getEntryAsNativeLibrary(String name)
{
return m_content.getEntryAsNativeLibrary(findPath(name));
}
@Override
public URL getEntryAsURL(String name)
{
return m_content.getEntryAsURL(findPath(name));
}
private String findPath(String path)
{
String internalPath = path;
while (internalPath.startsWith("/"))
{
internalPath = internalPath.substring(1);
}
if (!internalPath.startsWith("META-INF/"))
{
int version = m_javaVersion;
while (version >= 9)
{
String versionPath = "META-INF/versions/" + version-- + "/" + internalPath;
if (m_content.hasEntry(versionPath))
{
return versionPath;
}
}
}
return path;
}
}