Fix broken linking on data sources

core/src/main/java/org/polypheny/db/security/SecurityManager.java

@@ -16,7 +16,9 @@
 
 package org.polypheny.db.security;
 
+import java.net.URL;
 import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.Arrays;
 import java.util.Map;
 import java.util.Objects;
@@ -25,8 +27,9 @@
 import javax.annotation.Nullable;
 import lombok.Getter;
 import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
 
-
+@Slf4j
 public class SecurityManager {
 
     private static SecurityManager INSTANCE = null;
@@ -74,20 +77,30 @@ public boolean checkPathAccess( Path path ) {
             dir = dir.getParent();
         }
         AuthStatus status = this.status.get( dir );
-
+        if (dir.startsWith("classpath:")) {
+            status.setStep( AuthStep.SUCCESSFUL );
+            return true;
+        }
+        if (status == null) {
+            log.debug( "No auth status available for directory {}", dir );
+            return false;
+        }
         if ( status.step == AuthStep.SUCCESSFUL ) {
             return true;
         }
-        if ( Arrays.stream( Objects.requireNonNull( status.path.toFile().listFiles() ) ).noneMatch( f -> f.getName().equals( "polypheny.access" ) && f.isFile() ) ) {
-            // TODO: if more fine-grained access control is required, add as content of file
+        try {
+            if ( Arrays.stream( Objects.requireNonNull( status.path.toFile().listFiles() ) ).noneMatch( f -> f.getName().equals( "polypheny.access" ) && f.isFile() ) ) {
+                // TODO: if more fine-grained access control is required, add as content of file
+                return false;
+            }
+        } catch (Exception e) {
+            log.debug( "Filed to check for polypheny.access as the specified path is not a directory {}", dir );
             return false;
         }
-
         status.setStep( AuthStep.SUCCESSFUL );
         return true;
     }
 
-
     private enum AuthStep {
         INITIAL,
         SUCCESSFUL

dbms/src/main/java/org/polypheny/db/ddl/DdlManagerImpl.java

@@ -334,16 +334,15 @@ public void dropAdapter( String name, Statement statement ) {
         LogicalAdapter adapter = catalog.getSnapshot().getAdapter( name ).orElseThrow();
         if ( adapter.type == AdapterType.SOURCE ) {
             for ( AllocationEntity allocation : catalog.getSnapshot().alloc().getEntitiesOnAdapter( adapter.id ).orElse( List.of() ) ) {
-                // Make sure that there is only one adapter
-                if ( catalog.getSnapshot().alloc().getFromLogical( allocation.logicalId ).size() != 1 ) {
-                    throw new GenericRuntimeException( "The data source contains entities with more than one placement. This should not happen!" );
+                if ( catalog.getSnapshot().alloc().getFromLogical( allocation.logicalId ).isEmpty() ) {
+                    continue;
                 }
 
                 if ( allocation.unwrap( AllocationCollection.class ).isPresent() ) {
-                    //TODO: currently each document source creates its own namespace which can be disposed of together with the source
-                    //dropNamespace( catalog.getSnapshot().doc().getCollection( allocation.logicalId ).orElseThrow().getNamespaceName(), true, statement);
-                    dropCollection( catalog.getSnapshot().doc().getCollection( allocation.logicalId ).orElseThrow(), statement );
-                } else if ( allocation.unwrap( AllocationTable.class ).isPresent() ) {
+                    dropNamespace( catalog.getSnapshot().doc().getCollection( allocation.logicalId ).orElseThrow().getNamespaceName(), true, statement);
+                    continue;
+                }
+                if ( allocation.unwrap( AllocationTable.class ).isPresent() ) {
 
                     for ( LogicalForeignKey fk : catalog.getSnapshot().rel().getForeignKeys( allocation.logicalId ) ) {
                         catalog.getLogicalRel( allocation.namespaceId ).deleteForeignKey( fk.id );

plugins/json-adapter/src/main/java/org/polypheny/db/adapter/json/JsonMetaRetriever.java

@@ -56,12 +56,14 @@ public static URL findDocumentUrl(URL jsonFiles, String name) throws MalformedUR
         String[] extensions = { ".json", ".json.gz" };
         String path = jsonFiles.getPath();
 
+        // handle single file
         for ( String ext : extensions ) {
-            if ( path.endsWith( name + ext + "/" ) ) {
+            if ( path.endsWith( name + ext) ) {
                 return jsonFiles;
             }
         }
 
+        // handle directory
         Set<String> fileNames = getFileNames( jsonFiles );
         for ( String file : fileNames ) {
             for ( String ext : extensions ) {
@@ -71,7 +73,7 @@ public static URL findDocumentUrl(URL jsonFiles, String name) throws MalformedUR
             }
         }
 
-        throw new NoSuchFileException( "No XML file(s) found under the URL '" + jsonFiles + "'" );
+        throw new NoSuchFileException( "No JSON file(s) found under the URL '" + jsonFiles + "'" );
     }
 
 

plugins/xml-adapter/src/main/java/org/polypheny/db/adapter/xml/XmlMetaRetriever.java

@@ -65,7 +65,7 @@ public static URL findDocumentUrl( URL xmlFiles, String name ) throws MalformedU
         String path = xmlFiles.getPath();
 
         for ( String ext : extensions ) {
-            if ( path.endsWith( name + ext + "/" ) ) {
+            if ( path.endsWith( name + ext) ) {
                 return xmlFiles;
             }
         }

webui/src/main/java/org/polypheny/db/webui/Crud.java

@@ -78,14 +78,14 @@
 import org.polypheny.db.ResultIterator;
 import org.polypheny.db.adapter.AbstractAdapterSetting;
 import org.polypheny.db.adapter.AbstractAdapterSettingDirectory;
+import org.polypheny.db.adapter.AbstractAdapterSettingString;
 import org.polypheny.db.adapter.Adapter;
 import org.polypheny.db.adapter.AdapterManager;
 import org.polypheny.db.adapter.AdapterManager.AdapterInformation;
 import org.polypheny.db.adapter.ConnectionMethod;
 import org.polypheny.db.adapter.DataSource;
 import org.polypheny.db.adapter.DataStore;
 import org.polypheny.db.adapter.DataStore.FunctionalIndexInfo;
-import org.polypheny.db.adapter.RelationalDataSource;
 import org.polypheny.db.adapter.RelationalDataSource.ExportedColumn;
 import org.polypheny.db.adapter.index.IndexManager;
 import org.polypheny.db.adapter.java.AdapterTemplate;
@@ -2089,7 +2089,7 @@ void createAdapter( final Context ctx ) throws ServletException, IOException {
         String body = "";
         Map<String, InputStream> inputStreams = new HashMap<>();
 
-        final AdapterModel a;
+        final AdapterModel adapterModel;
         if ( ctx.isMultipartFormData() ) {
             // collect all files e.g. csv files
             for ( Part part : ctx.req.getParts() ) {
@@ -2099,50 +2099,56 @@ void createAdapter( final Context ctx ) throws ServletException, IOException {
                     inputStreams.put( part.getName(), part.getInputStream() );
                 }
             }
-            a = HttpServer.mapper.readValue( body, AdapterModel.class );
+            adapterModel = HttpServer.mapper.readValue( body, AdapterModel.class );
         } else if ( "application/json".equals( ctx.contentType() ) ) {
-            a = ctx.bodyAsClass( AdapterModel.class );
+            adapterModel = ctx.bodyAsClass( AdapterModel.class );
         } else {
             ctx.status( HttpCode.BAD_REQUEST );
             return;
         }
 
-        Map<String, String> settings = new HashMap<>();
+        AdapterTemplate adapterTemplate = AdapterManager.getAdapterTemplate( adapterModel.adapterName, adapterModel.type );
 
+        // This is only used to be able to get the type of property based on the key
+        Map<String, AbstractAdapterSetting> defaultSettings = adapterTemplate.settings.stream().collect( Collectors.toMap( e -> e.name, e -> e ) );
         ConnectionMethod method = ConnectionMethod.UPLOAD;
-        if ( a.settings.containsKey( "method" ) ) {
-            method = ConnectionMethod.valueOf( a.settings.get( "method" ).toUpperCase() );
+        if ( adapterModel.settings.containsKey( "method" ) ) {
+            method = ConnectionMethod.valueOf( adapterModel.settings.get( "method" ).toUpperCase() );
         }
-        AdapterTemplate adapter = AdapterManager.getAdapterTemplate( a.adapterName, a.type );
-        Map<String, AbstractAdapterSetting> allSettings = adapter.settings.stream().collect( Collectors.toMap( e -> e.name, e -> e ) );
 
-        for ( Map.Entry<String, String> entry : a.settings.entrySet() ) {
-            AbstractAdapterSetting set = allSettings.get( entry.getKey() );
-            if ( set == null ) {
+        Map<String, String> adapterSettings = new HashMap<>();
+
+        for ( Map.Entry<String, String> entry : adapterModel.settings.entrySet() ) {
+            if ( !defaultSettings.containsKey( entry.getKey() ) ) {
+                // specified property is not available for this adapter
                 continue;
             }
-            if ( set instanceof AbstractAdapterSettingDirectory setting ) {
-                if ( method == ConnectionMethod.LINK ) {
-                    Exception e = handleLinkFiles( ctx, a, setting, allSettings );
-                    if ( e != null ) {
-                        ctx.json( RelationalResult.builder().exception( e ).build() );
-                        return;
-                    }
-                    settings.put( set.name, entry.getValue() );
-                } else {
-                    List<String> fileNames = HttpServer.mapper.readValue( entry.getValue(), new TypeReference<>() {
-                    } );
-                    String directory = handleUploadFiles( inputStreams, fileNames, setting, a );
-                    settings.put( set.name, directory );
+            adapterSettings.put( entry.getKey(), entry.getValue() );
+            AbstractAdapterSetting set = defaultSettings.get( entry.getKey() );
+            // handle upload
+            if ( (set instanceof AbstractAdapterSettingDirectory settingDirectory) && method == ConnectionMethod.UPLOAD ) {
+                List<String> fileNames = HttpServer.mapper.readValue( entry.getValue(), new TypeReference<>() {
+                } );
+                String directory = handleUploadFiles( inputStreams, fileNames, settingDirectory, adapterModel );
+                adapterSettings.put( entry.getKey(), directory );
+                continue;
+            }
+            // handle linking
+            if ( (set instanceof AbstractAdapterSettingString settingString) && method == ConnectionMethod.LINK ) {
+                if ( !settingString.name.equals( "directoryName" ) ) {
+                    continue;
+                }
+                Exception e = handleLinkFiles( settingString );
+                if ( e != null ) {
+                    ctx.json( RelationalResult.builder().exception( e ).build() );
+                    return;
                 }
-            } else {
-                settings.put( set.name, entry.getValue() );
             }
         }
 
-        settings.put( "mode", a.mode.toString() );
+        adapterSettings.put( "mode", adapterModel.mode.toString() );
 
-        String query = String.format( "ALTER ADAPTERS ADD \"%s\" USING '%s' AS '%s' WITH '%s'", a.name, a.adapterName, a.type, Crud.gson.toJson( settings ) );
+        String query = String.format( "ALTER ADAPTERS ADD \"%s\" USING '%s' AS '%s' WITH '%s'", adapterModel.name, adapterModel.adapterName, adapterModel.type, Crud.gson.toJson( adapterSettings ) );
         QueryLanguage language = QueryLanguage.from( "sql" );
         Result<?, ?> res = LanguageCrud.anyQueryResult(
                 QueryContext.builder()
@@ -2166,15 +2172,12 @@ public void startAccessRequest( Context ctx ) {
     }
 
 
-    private Exception handleLinkFiles( Context ctx, AdapterModel a, AbstractAdapterSettingDirectory setting, Map<String, AbstractAdapterSetting> settings ) {
-        if ( !settings.containsKey( "directoryName" ) ) {
-            return new GenericRuntimeException( "Security check for access was not performed; id missing." );
-        }
-        Path path = Path.of( settings.get( "directoryName" ).defaultValue );
+    private Exception handleLinkFiles( AbstractAdapterSettingString setting ) {
+        Path path = Path.of( setting.getValue() );
+        SecurityManager.getInstance().requestPathAccess( "webui", "webui", path );
         if ( !SecurityManager.getInstance().checkPathAccess( path ) ) {
             return new GenericRuntimeException( "Security check for access was not successful; not enough permissions." );
         }
-
         return null;
     }