X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=cadi%2Faaf%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fcadi%2Fpersist%2FPersistFile.java;h=c7d714886b38e157792d881427b7a5822c9dc36b;hb=7e966914050e66219689001ff4ab601a49eef0ac;hp=8fd2c98613a0bccce5f2f4bc52c3c8fd8505ad46;hpb=36b62be84b398044e1feae657c662dba6247782f;p=aaf%2Fauthz.git

diff --git a/cadi/aaf/src/main/java/org/onap/aaf/cadi/persist/PersistFile.java b/cadi/aaf/src/main/java/org/onap/aaf/cadi/persist/PersistFile.java
index 8fd2c986..c7d71488 100644
--- a/cadi/aaf/src/main/java/org/onap/aaf/cadi/persist/PersistFile.java
+++ b/cadi/aaf/src/main/java/org/onap/aaf/cadi/persist/PersistFile.java
@@ -50,206 +50,206 @@ import org.onap.aaf.misc.rosetta.env.RosettaDF;
 
 public class PersistFile {
 
-	private static final String HASH_NO_MATCH = "Hash does not match in Persistence";
-	private static final Object LOCK = new Object();
-	
-	protected static Symm symm;
-	public Access access;
-	protected final Path tokenPath;
-	protected final String tokenDir;
-	private static final boolean isWindows = System.getProperty("os.name").startsWith("Windows");
-	
-	public PersistFile(Access access, String sub_dir) throws CadiException, APIException {
-		this.access = access;
-		tokenPath = Paths.get(access.getProperty(Config.CADI_TOKEN_DIR,"tokens"), sub_dir);
-		try {
-			if(!Files.exists(tokenPath)) {
-				if(isWindows) {
-					// Sorry Windows users, you need to secure your own paths
-					Files.createDirectories(tokenPath);
-				} else {
-					Set<PosixFilePermission> spfp = PosixFilePermissions.fromString("rwxr-x---");
-					Files.createDirectories(tokenPath,PosixFilePermissions.asFileAttribute(spfp));
-				}
-			}
-			tokenDir=tokenPath.toRealPath().toString();
-		} catch (IOException e) {
-			throw new CadiException(e);
-		}
-		synchronized(LOCK) {
-			if(symm==null) {
-				symm = Symm.obtain(access);
-			}
-		}
-	}
+    private static final String HASH_NO_MATCH = "Hash does not match in Persistence";
+    private static final Object LOCK = new Object();
+    
+    protected static Symm symm;
+    public Access access;
+    protected final Path tokenPath;
+    protected final String tokenDir;
+    private static final boolean isWindows = System.getProperty("os.name").startsWith("Windows");
+    
+    public PersistFile(Access access, String sub_dir) throws CadiException, APIException {
+        this.access = access;
+        tokenPath = Paths.get(access.getProperty(Config.CADI_TOKEN_DIR,"tokens"), sub_dir);
+        try {
+            if (!Files.exists(tokenPath)) {
+                if (isWindows) {
+                    // Sorry Windows users, you need to secure your own paths
+                    Files.createDirectories(tokenPath);
+                } else {
+                    Set<PosixFilePermission> spfp = PosixFilePermissions.fromString("rwxr-x---");
+                    Files.createDirectories(tokenPath,PosixFilePermissions.asFileAttribute(spfp));
+                }
+            }
+            tokenDir=tokenPath.toRealPath().toString();
+        } catch (IOException e) {
+            throw new CadiException(e);
+        }
+        synchronized(LOCK) {
+            if (symm==null) {
+                symm = Symm.obtain(access);
+            }
+        }
+    }
 
-	public<T> Path writeDisk(final RosettaDF<T> df, final T t, final byte[] cred, final String filename, final long expires) throws CadiException {
-		return writeDisk(df,t,cred,Paths.get(tokenDir,filename),expires);
-	}
+    public<T> Path writeDisk(final RosettaDF<T> df, final T t, final byte[] cred, final String filename, final long expires) throws CadiException {
+        return writeDisk(df,t,cred,Paths.get(tokenDir,filename),expires);
+    }
 
-	public<T> Path writeDisk(final RosettaDF<T> df, final T t, final byte[] cred, final Path target, final long expires) throws CadiException {
-		// Make sure File is completely written before making accessible on disk... avoid corruption.
-		try {
-			Path tpath = Files.createTempFile(tokenPath,target.getFileName().toString(), ".tmp");
-			final OutputStream dos = Files.newOutputStream(tpath, StandardOpenOption.CREATE,StandardOpenOption.WRITE);
-				try {
-				// Write Expires so that we can read unencrypted.
-				for(int i=0;i<Long.SIZE;i+=8) {
-					dos.write((byte)((expires>>i)&0xFF));
-				}
+    public<T> Path writeDisk(final RosettaDF<T> df, final T t, final byte[] cred, final Path target, final long expires) throws CadiException {
+        // Make sure File is completely written before making accessible on disk... avoid corruption.
+        try {
+            Path tpath = Files.createTempFile(tokenPath,target.getFileName().toString(), ".tmp");
+            final OutputStream dos = Files.newOutputStream(tpath, StandardOpenOption.CREATE,StandardOpenOption.WRITE);
+                try {
+                // Write Expires so that we can read unencrypted.
+                for (int i=0;i<Long.SIZE;i+=8) {
+                    dos.write((byte)((expires>>i)&0xFF));
+                }
 
-				symm.exec(new Symm.SyncExec<Void>() {
-					@Override
-					public Void exec(Encryption enc) throws Exception {
-						CipherOutputStream os = enc.outputStream(dos, true);
-						try {
-							int size = cred==null?0:cred.length;
-							for(int i=0;i<Integer.SIZE;i+=8) {
-								os.write((byte)((size>>i)&0xFF));
-							}
-							if(cred!=null) {
-								os.write(cred);
-							}
-							df.newData().load(t).to(os);
-						} finally {
-							// Note: Someone on the Web noticed that using a DataOutputStream would not full close out without a flush first, 
-							// leaving files open.
-							try {
-								os.flush();
-							} catch (IOException e) {
-								access.log(Level.INFO, "Note: Caught Exeption while flushing CipherStream.  Handled.");
-							}
-							try {
-								os.close();
-							} catch (IOException e) {
-								access.log(Level.INFO, "Note: Caught Exeption while closing CipherStream.  Handled.");
-							}
-						}
-						return null;
-					}
-				});
-			} catch(Exception e) {
-				throw new CadiException(e);
-			} finally {
-				dos.close();
-			}
-			return Files.move(tpath, target, StandardCopyOption.ATOMIC_MOVE,StandardCopyOption.REPLACE_EXISTING);
-		} catch (IOException e) {
-			throw new CadiException(e);
-		}
+                symm.exec(new Symm.SyncExec<Void>() {
+                    @Override
+                    public Void exec(Encryption enc) throws Exception {
+                        CipherOutputStream os = enc.outputStream(dos, true);
+                        try {
+                            int size = cred==null?0:cred.length;
+                            for (int i=0;i<Integer.SIZE;i+=8) {
+                                os.write((byte)((size>>i)&0xFF));
+                            }
+                            if (cred!=null) {
+                                os.write(cred);
+                            }
+                            df.newData().load(t).to(os);
+                        } finally {
+                            // Note: Someone on the Web noticed that using a DataOutputStream would not full close out without a flush first, 
+                            // leaving files open.
+                            try {
+                                os.flush();
+                            } catch (IOException e) {
+                                access.log(Level.INFO, "Note: Caught Exeption while flushing CipherStream.  Handled.");
+                            }
+                            try {
+                                os.close();
+                            } catch (IOException e) {
+                                access.log(Level.INFO, "Note: Caught Exeption while closing CipherStream.  Handled.");
+                            }
+                        }
+                        return null;
+                    }
+                });
+            } catch (Exception e) {
+                throw new CadiException(e);
+            } finally {
+                dos.close();
+            }
+            return Files.move(tpath, target, StandardCopyOption.ATOMIC_MOVE,StandardCopyOption.REPLACE_EXISTING);
+        } catch (IOException e) {
+            throw new CadiException(e);
+        }
 
-	}
+    }
 
-	public <T> T readDisk(final RosettaDF<T> df, final byte[] cred, final String filename,final Holder<Path> hp, final Holder<Long> hl) throws CadiException {
-		if(hp.get()==null) {
-			hp.set(Paths.get(tokenDir,filename));
-		}
-		return readDisk(df,cred,hp.get(),hl);
-	}
-	
-	public <T> T readDisk(final RosettaDF<T> df, final byte[] cred, final Path target, final Holder<Long> hexpired) throws CadiException {
-		// Try from Disk
-		T t = null;
-		if(Files.exists(target)) {
-			try {
-				final InputStream is = Files.newInputStream(target,StandardOpenOption.READ);
-				try {
-					// Read Expired unencrypted
-					long exp=0;
-					for(int i=0;i<Long.SIZE;i+=8) {
-						exp |= ((long)is.read()<<i);
-					}
-					hexpired.set(exp);
-				
-					t = symm.exec(new Symm.SyncExec<T>() {
-						@Override
-						public T exec(Encryption enc) throws Exception {
-							CipherInputStream dis = enc.inputStream(is,false);
-							try {
-								int size=0;
-								for(int i=0;i<Integer.SIZE;i+=8) {
-									size |= ((int)dis.read()<<i);
-								}
-								if(size>256) {
-									throw new CadiException("Invalid size in Token Persistence");
-								} else if(cred!=null && size!=cred.length) {
-									throw new CadiException(HASH_NO_MATCH);
-								}
-								if(cred!=null) {
-									byte[] array = new byte[size];
-									if(dis.read(array)>0) {
-										for(int i=0;i<size;++i) {
-											if(cred[i]!=array[i]) {
-												throw new CadiException(HASH_NO_MATCH);
-											}
-										}
-									}
-								}
-								return df.newData().load(dis).asObject();
-							} finally {
-								dis.close();
-							}
-						}
-					});
-				} finally {
-					is.close();
-				}
-			} catch (NoSuchFileException e) { 
-				return t;
-			} catch (Exception e) {
-				throw new CadiException(e);
-			}
-		}
-		return t;
-	}
-	
-	public long readExpiration(final Path target) throws CadiException {
-		long exp=0L;
-		if(Files.exists(target)) {
-			try {
-				final InputStream is = Files.newInputStream(target,StandardOpenOption.READ);
-				try {
-					for(int i=0;i<Long.SIZE;i+=8) {
-						exp |= ((long)is.read()<<i);
-					}
-				} finally {
-					is.close();
-				}
-				return exp;
-			} catch (Exception e) {
-				throw new CadiException(e);
-			}
-		}
-		return exp;
-	}
+    public <T> T readDisk(final RosettaDF<T> df, final byte[] cred, final String filename,final Holder<Path> hp, final Holder<Long> hl) throws CadiException {
+        if (hp.get()==null) {
+            hp.set(Paths.get(tokenDir,filename));
+        }
+        return readDisk(df,cred,hp.get(),hl);
+    }
+    
+    public <T> T readDisk(final RosettaDF<T> df, final byte[] cred, final Path target, final Holder<Long> hexpired) throws CadiException {
+        // Try from Disk
+        T t = null;
+        if (Files.exists(target)) {
+            try {
+                final InputStream is = Files.newInputStream(target,StandardOpenOption.READ);
+                try {
+                    // Read Expired unencrypted
+                    long exp=0;
+                    for (int i=0;i<Long.SIZE;i+=8) {
+                        exp |= ((long)is.read()<<i);
+                    }
+                    hexpired.set(exp);
+                
+                    t = symm.exec(new Symm.SyncExec<T>() {
+                        @Override
+                        public T exec(Encryption enc) throws Exception {
+                            CipherInputStream dis = enc.inputStream(is,false);
+                            try {
+                                int size=0;
+                                for (int i=0;i<Integer.SIZE;i+=8) {
+                                    size |= ((int)dis.read()<<i);
+                                }
+                                if (size>256) {
+                                    throw new CadiException("Invalid size in Token Persistence");
+                                } else if (cred!=null && size!=cred.length) {
+                                    throw new CadiException(HASH_NO_MATCH);
+                                }
+                                if (cred!=null) {
+                                    byte[] array = new byte[size];
+                                    if (dis.read(array)>0) {
+                                        for (int i=0;i<size;++i) {
+                                            if (cred[i]!=array[i]) {
+                                                throw new CadiException(HASH_NO_MATCH);
+                                            }
+                                        }
+                                    }
+                                }
+                                return df.newData().load(dis).asObject();
+                            } finally {
+                                dis.close();
+                            }
+                        }
+                    });
+                } finally {
+                    is.close();
+                }
+            } catch (NoSuchFileException e) { 
+                return t;
+            } catch (Exception e) {
+                throw new CadiException(e);
+            }
+        }
+        return t;
+    }
+    
+    public long readExpiration(final Path target) throws CadiException {
+        long exp=0L;
+        if (Files.exists(target)) {
+            try {
+                final InputStream is = Files.newInputStream(target,StandardOpenOption.READ);
+                try {
+                    for (int i=0;i<Long.SIZE;i+=8) {
+                        exp |= ((long)is.read()<<i);
+                    }
+                } finally {
+                    is.close();
+                }
+                return exp;
+            } catch (Exception e) {
+                throw new CadiException(e);
+            }
+        }
+        return exp;
+    }
 
-	public void deleteFromDisk(Path path) {
-		try {
-			Files.deleteIfExists(path);
-		} catch (IOException e) {
-			access.log(Level.ERROR, e);
-		}
-	}
+    public void deleteFromDisk(Path path) {
+        try {
+            Files.deleteIfExists(path);
+        } catch (IOException e) {
+            access.log(Level.ERROR, e);
+        }
+    }
 
-	public void deleteFromDisk(String token) {
-		Path tpath = Paths.get(tokenDir,token);
-		try {
-			Files.deleteIfExists(tpath);
-		} catch (IOException e) {
-			access.log(Level.ERROR, e);
-		}
-	}
+    public void deleteFromDisk(String token) {
+        Path tpath = Paths.get(tokenDir,token);
+        try {
+            Files.deleteIfExists(tpath);
+        } catch (IOException e) {
+            access.log(Level.ERROR, e);
+        }
+    }
 
-	public Path getPath(String filename) {
-		return Paths.get(tokenDir,filename);
-	}
-	
-	public FileTime getFileTime(String filename, Holder<Path> hp) throws IOException {
-		Path p = hp.get();
-		if(p==null) {
-			hp.set(p=Paths.get(tokenDir,filename));
-		}
-		return Files.getLastModifiedTime(p);
-	}
+    public Path getPath(String filename) {
+        return Paths.get(tokenDir,filename);
+    }
+    
+    public FileTime getFileTime(String filename, Holder<Path> hp) throws IOException {
+        Path p = hp.get();
+        if (p==null) {
+            hp.set(p=Paths.get(tokenDir,filename));
+        }
+        return Files.getLastModifiedTime(p);
+    }
 
 }