Skip to content

Include /.well-known/security.txt #7361

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
labkey-jeckels wants to merge 1 commit into
base: develop
Choose a base branch
from
+29 −24
Open

Include /.well-known/security.txt #7361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/src/org/labkey/core/security/BlockListFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ public static boolean isSuspicious(String request_path, String query, String use
return true;
for (String part : path)
{
if (part.startsWith(".") || part.startsWith("\">") || part.startsWith("wp-") || (part.startsWith("admin")&&!isActionURL))
if ((part.startsWith(".") && !part.equals(".well-known")) || part.startsWith("\">") || part.startsWith("wp-") || (part.startsWith("admin")&&!isActionURL))
return true;
if (part.endsWith("-inf"))
return true;
Expand Down
46 changes: 23 additions & 23 deletions core/src/org/labkey/core/webdav/ModuleStaticResolverImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import org.labkey.api.cache.Cache;
import org.labkey.api.cache.CacheListener;
import org.labkey.api.cache.CacheManager;
import org.labkey.api.collections.CaseInsensitiveHashSet;
import org.labkey.api.collections.CaseInsensitiveTreeMap;
import org.labkey.api.files.FileSystemDirectoryListener;
import org.labkey.api.files.FileSystemWatcher;
Expand Down Expand Up @@ -57,12 +58,14 @@
import java.io.InputStream;
import java.nio.file.WatchEvent;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;

Expand Down Expand Up @@ -181,16 +184,15 @@ private LookupResult resolve(Path path)
for (int i=0 ; i<path.size() ; i++)
{
Path.Part p = path.getPart(i);
if (null == p || p.toString().equalsIgnoreCase("META-INF") || p.toString().equalsIgnoreCase("WEB-INF") || p.toString().startsWith("."))
if (null == p || !isAllowableName(p.toString()))
return null;
r = r.find(p);
if (null == r)
return null;
if (r instanceof SymbolicLink)
if (r instanceof SymbolicLink symbolicLink)
{
Path remainder = path.subpath(i+1,path.getNameCount());
LookupResult result = ((SymbolicLink)r).lookupEx(remainder);
return result;
return symbolicLink.lookupEx(remainder);
}
}
return new LookupResult(this,r);
Expand Down Expand Up @@ -292,12 +294,7 @@ public void addLink(@NotNull Path from, @NotNull Path target, String indexPage)

synchronized (shortcuts)
{
Map<String,Pair<Path,String>> map = shortcuts.get(rParent.getPath());
if (null == map)
{
map = new HashMap<>();
shortcuts.put(rParent.getPath(), map);
}
Map<String, Pair<Path, String>> map = shortcuts.computeIfAbsent(rParent.getPath(), k -> new HashMap<>());
map.put(from.getName(), new Pair<>(target,indexPage));
}

Expand Down Expand Up @@ -387,6 +384,15 @@ public boolean shouldIndex()
}
}

private static final Set<String> ALLOWED_DOT_NAMES = Collections.unmodifiableSet(new CaseInsensitiveHashSet(Arrays.asList(".well-known")));

private boolean isAllowableName(String name)
{
return !"WEB-INF".equalsIgnoreCase(name) &&
!"META-INF".equalsIgnoreCase(name) &&
(!name.startsWith(".") || ALLOWED_DOT_NAMES.contains(name));
}

private static final Cache<Path, Map<String, WebdavResource>> CHILDREN_CACHE = CacheManager.getCache(1000, CacheManager.DAY, "Static resources");

private class StaticResource extends _PublicResource implements SupportsFileSystemWatcher
Expand Down Expand Up @@ -425,12 +431,6 @@ public WebdavResolver getResolver()
return ModuleStaticResolverImpl.this;
}

@Override
public boolean canList(User user, boolean forRead)
{
return true;
}

Map<String,WebdavResource> getChildren()
{
synchronized (_lock)
Expand All @@ -447,7 +447,7 @@ Map<String,WebdavResource> getChildren()
for (FileLike fo : files)
{
String name = fo.getName();
if (name.startsWith(".") || name.equals("WEB-INF") || name.equals("META-INF"))
if (!isAllowableName(name))
continue;
if (!map.containsKey(name))
map.put(name, new ArrayList<>());
Expand All @@ -459,7 +459,7 @@ Map<String,WebdavResource> getChildren()
{
Path path = getPath().append(e.getKey());
List<FileLike> alternates = e.getValue();
if (alternates.get(0).isFile())
if (alternates.getFirst().isFile())
children.put(e.getKey(), new StaticResource(this, path, alternates.subList(0,1), null));
else
children.put(e.getKey(), new StaticResource(this, path, e.getValue(), null));
Expand Down Expand Up @@ -518,7 +518,7 @@ public File getFile()
{
if (!exists())
return null;
return _files.get(0).toNioPathForRead().toFile();
return _files.getFirst().toNioPathForRead().toFile();
}

@Override
Expand All @@ -537,7 +537,7 @@ public boolean exists()
@Override
public boolean isCollection()
{
return exists() && _files.get(0).isDirectory();
return exists() && _files.getFirst().isDirectory();
}

@Override
Expand All @@ -549,7 +549,7 @@ public WebdavResource find(Path.Part name)
@Override
public boolean isFile()
{
return exists() && _files.get(0).isFile();
return exists() && _files.getFirst().isFile();
}

@Override
Expand All @@ -572,7 +572,7 @@ public long getLastModified()
public InputStream getInputStream(User user) throws IOException
{
if (isFile())
return _files.get(0).openInputStream();
return _files.getFirst().openInputStream();
return null;
}

Expand All @@ -586,7 +586,7 @@ public long copyFrom(User user, FileStream in)
public long getContentLength()
{
if (isFile())
return _files.get(0).getSize();
return _files.getFirst().getSize();
return 0;
}

Expand Down
5 changes: 5 additions & 0 deletions core/webapp/.well-known/security.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Contact: https://www.labkey.com/about/contact-us/
Expires: 2030-01-01T00:00:00.000Z
Preferred-Languages: en
Policy: https://www.labkey.org/Documentation/wiki-page.view?name=securityFixEvaluation
Acknowledgements: https://www.labkey.org/Documentation/wiki-page.view?name=securityFixEvaluation