annotate src/luan/host/WebHandler.java @ 1330:f41919741100

fix security
author Franklin Schmidt <fschmidt@gmail.com>
date Mon, 11 Feb 2019 01:38:55 -0700
parents 307e76ccd0d6
children 11b7e11f9ed5
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1185
94cf2576a922 implement WebHandler for nginx
Franklin Schmidt <fschmidt@gmail.com>
parents: 1182
diff changeset
1 package luan.host;
1135
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
2
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
3 import java.io.File;
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
4 import org.slf4j.Logger;
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
5 import org.slf4j.LoggerFactory;
1185
94cf2576a922 implement WebHandler for nginx
Franklin Schmidt <fschmidt@gmail.com>
parents: 1182
diff changeset
6 import luan.webserver.Handler;
94cf2576a922 implement WebHandler for nginx
Franklin Schmidt <fschmidt@gmail.com>
parents: 1182
diff changeset
7 import luan.webserver.Request;
94cf2576a922 implement WebHandler for nginx
Franklin Schmidt <fschmidt@gmail.com>
parents: 1182
diff changeset
8 import luan.webserver.Response;
1315
5763597ca5c0 add DomainHandler
Franklin Schmidt <fschmidt@gmail.com>
parents: 1314
diff changeset
9 import luan.webserver.handlers.DomainHandler;
1330
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
10 import luan.Luan;
1135
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
11 import luan.LuanState;
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
12 import luan.LuanException;
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
13 import luan.LuanTable;
1330
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
14 import luan.LuanFunction;
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
15 import luan.LuanClosure;
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
16 import luan.modules.BasicLuan;
1185
94cf2576a922 implement WebHandler for nginx
Franklin Schmidt <fschmidt@gmail.com>
parents: 1182
diff changeset
17 import luan.modules.http.LuanHandler;
1321
307e76ccd0d6 generalize separate logging
Franklin Schmidt <fschmidt@gmail.com>
parents: 1315
diff changeset
18 import luan.modules.logging.LuanLogger;
1135
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
19
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
20
1185
94cf2576a922 implement WebHandler for nginx
Franklin Schmidt <fschmidt@gmail.com>
parents: 1182
diff changeset
21 public class WebHandler implements Handler {
1135
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
22 private static final Logger logger = LoggerFactory.getLogger(WebHandler.class);
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
23
1330
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
24 private static final class LuanRuntimeException extends RuntimeException {
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
25 final LuanException e;
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
26
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
27 LuanRuntimeException(LuanException e) {
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
28 this.e = e;
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
29 }
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
30 }
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
31
1315
5763597ca5c0 add DomainHandler
Franklin Schmidt <fschmidt@gmail.com>
parents: 1314
diff changeset
32 private static final DomainHandler.Factory factory = new DomainHandler.Factory() {
5763597ca5c0 add DomainHandler
Franklin Schmidt <fschmidt@gmail.com>
parents: 1314
diff changeset
33 public Handler newHandler(String domain) {
5763597ca5c0 add DomainHandler
Franklin Schmidt <fschmidt@gmail.com>
parents: 1314
diff changeset
34 File dir = new File(sitesDir,domain);
5763597ca5c0 add DomainHandler
Franklin Schmidt <fschmidt@gmail.com>
parents: 1314
diff changeset
35 if( !dir.exists() /* && !recover(dir) */ )
5763597ca5c0 add DomainHandler
Franklin Schmidt <fschmidt@gmail.com>
parents: 1314
diff changeset
36 return null;
5763597ca5c0 add DomainHandler
Franklin Schmidt <fschmidt@gmail.com>
parents: 1314
diff changeset
37 String dirStr = dir.toString();
1230
034f2a0b3915 better gc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1203
diff changeset
38
1315
5763597ca5c0 add DomainHandler
Franklin Schmidt <fschmidt@gmail.com>
parents: 1314
diff changeset
39 String logDir = dirStr + "/site/private/local/logs/web";
5763597ca5c0 add DomainHandler
Franklin Schmidt <fschmidt@gmail.com>
parents: 1314
diff changeset
40 new File(logDir).mkdirs();
1230
034f2a0b3915 better gc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1203
diff changeset
41
1315
5763597ca5c0 add DomainHandler
Franklin Schmidt <fschmidt@gmail.com>
parents: 1314
diff changeset
42 LuanState luan = new LuanState();
1321
307e76ccd0d6 generalize separate logging
Franklin Schmidt <fschmidt@gmail.com>
parents: 1315
diff changeset
43 try {
307e76ccd0d6 generalize separate logging
Franklin Schmidt <fschmidt@gmail.com>
parents: 1315
diff changeset
44 LuanLogger.newLoggerRepository(luan);
307e76ccd0d6 generalize separate logging
Franklin Schmidt <fschmidt@gmail.com>
parents: 1315
diff changeset
45 } catch(LuanException e) {
307e76ccd0d6 generalize separate logging
Franklin Schmidt <fschmidt@gmail.com>
parents: 1315
diff changeset
46 throw new RuntimeException(e);
307e76ccd0d6 generalize separate logging
Franklin Schmidt <fschmidt@gmail.com>
parents: 1315
diff changeset
47 }
307e76ccd0d6 generalize separate logging
Franklin Schmidt <fschmidt@gmail.com>
parents: 1315
diff changeset
48 initLuan(luan,dirStr,domain,true);
307e76ccd0d6 generalize separate logging
Franklin Schmidt <fschmidt@gmail.com>
parents: 1315
diff changeset
49 return new LuanHandler(luan);
1230
034f2a0b3915 better gc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1203
diff changeset
50 }
1315
5763597ca5c0 add DomainHandler
Franklin Schmidt <fschmidt@gmail.com>
parents: 1314
diff changeset
51 };
1230
034f2a0b3915 better gc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1203
diff changeset
52
1330
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
53 public static String securityPassword = "password"; // change for security
1315
5763597ca5c0 add DomainHandler
Franklin Schmidt <fschmidt@gmail.com>
parents: 1314
diff changeset
54 private static final DomainHandler domainHandler = new DomainHandler(factory);
1202
d3a3ca116e42 gc site instances
Franklin Schmidt <fschmidt@gmail.com>
parents: 1187
diff changeset
55 private static String sitesDir = null;
1135
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
56
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
57 public static boolean isServing() {
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
58 return sitesDir != null;
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
59 }
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
60
1185
94cf2576a922 implement WebHandler for nginx
Franklin Schmidt <fschmidt@gmail.com>
parents: 1182
diff changeset
61 public WebHandler(String dir) {
1135
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
62 if( sitesDir != null )
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
63 throw new RuntimeException("already set");
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
64 if( !new File(dir).exists() )
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
65 throw new RuntimeException();
1230
034f2a0b3915 better gc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1203
diff changeset
66 sitesDir = dir;
1135
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
67 }
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
68
1315
5763597ca5c0 add DomainHandler
Franklin Schmidt <fschmidt@gmail.com>
parents: 1314
diff changeset
69 @Override public Response handle(Request request) {
5763597ca5c0 add DomainHandler
Franklin Schmidt <fschmidt@gmail.com>
parents: 1314
diff changeset
70 return domainHandler.handle(request);
1135
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
71 }
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
72
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
73 public static Object runLuan(String domain,String sourceText,String sourceName) throws LuanException {
1315
5763597ca5c0 add DomainHandler
Franklin Schmidt <fschmidt@gmail.com>
parents: 1314
diff changeset
74 LuanHandler luanHandler = (LuanHandler)domainHandler.getHandler(domain);
5763597ca5c0 add DomainHandler
Franklin Schmidt <fschmidt@gmail.com>
parents: 1314
diff changeset
75 return luanHandler.runLuan(sourceText,sourceName);
1135
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
76 }
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
77
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
78 public static Object callSite(String domain,String fnName,Object... args) throws LuanException {
1315
5763597ca5c0 add DomainHandler
Franklin Schmidt <fschmidt@gmail.com>
parents: 1314
diff changeset
79 LuanHandler luanHandler = (LuanHandler)domainHandler.getHandler(domain);
5763597ca5c0 add DomainHandler
Franklin Schmidt <fschmidt@gmail.com>
parents: 1314
diff changeset
80 return luanHandler.call_rpc(fnName,args);
1135
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
81 }
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
82
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
83 /*
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
84 private static boolean recover(File dir) {
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
85 File backups = new File(dir.getParentFile().getParentFile(),"backups");
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
86 if( !backups.exists() )
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
87 return false;
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
88 String name = dir.getName();
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
89 File from = null;
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
90 for( File backup : backups.listFiles() ) {
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
91 File d = new File(backup,"current/"+name);
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
92 if( d.exists() && (from==null || from.lastModified() < d.lastModified()) )
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
93 from = d;
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
94 }
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
95 if( from == null )
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
96 return false;
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
97 if( !from.renameTo(dir) )
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
98 throw new RuntimeException("couldn't rename "+from+" to "+dir);
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
99 logger.info("recovered "+name+" from "+from);
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
100 return true;
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
101 }
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
102 */
1330
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
103 static void initLuan(LuanState luan,String dir,String domain,boolean logging) {
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
104 security(luan,dir);
1135
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
105 try {
1330
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
106 LuanFunction fn = BasicLuan.load_file(luan,"classpath:luan/host/init.luan");
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
107 fn.call(luan,new Object[]{dir,domain,logging});
1135
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
108 } catch(LuanException e) {
1330
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
109 throw new LuanRuntimeException(e);
1135
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
110 }
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
111 }
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
112
1315
5763597ca5c0 add DomainHandler
Franklin Schmidt <fschmidt@gmail.com>
parents: 1314
diff changeset
113 public static void removeHandler(String domain) {
5763597ca5c0 add DomainHandler
Franklin Schmidt <fschmidt@gmail.com>
parents: 1314
diff changeset
114 domainHandler.removeHandler(domain);
1135
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
115 }
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
116
1330
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
117 public static void loadHandler(String domain) throws LuanException {
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
118 try {
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
119 domainHandler.getHandler(domain);
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
120 } catch(LuanRuntimeException e) {
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
121 throw e.e;
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
122 }
1135
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
123 }
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
124
1330
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
125 private static final void security(LuanState luan,String dir) {
1174
bdf27aa2a65c fix luanhost security bug
Franklin Schmidt <fschmidt@gmail.com>
parents: 1136
diff changeset
126 final String siteUri = "file:" + dir + "/site";
1330
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
127 Luan.Security security = new Luan.Security() {
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
128 public void check(LuanState luan,LuanClosure closure,String op,Object... args)
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
129 throws LuanException
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
130 {
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
131 if( op.equals("uri") ) {
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
132 String name = (String)args[0];
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
133 if( name.startsWith("file:") ) {
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
134 if( name.contains("..") )
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
135 throw new LuanException("Security violation - '"+name+"' contains '..'");
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
136 if( !(name.equals(siteUri) || name.startsWith(siteUri+"/")) )
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
137 throw new LuanException("Security violation - '"+name+"' outside of site dir");
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
138 }
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
139 else if( name.startsWith("classpath:luan/host/") ) {
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
140 throw new LuanException("Security violation");
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
141 }
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
142 else if( name.startsWith("os:") || name.startsWith("bash:") ) {
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
143 throw new LuanException("Security violation");
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
144 }
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
145 } else {
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
146 String name = closure.sourceName;
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
147 if( !(
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
148 name.startsWith("luan:")
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
149 || name.startsWith("classpath:")
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
150 || name.matches("^file:[^/]+$")
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
151 ) )
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
152 throw new LuanException("Security violation - only luan:* modules can load Java");
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
153 if( name.equals("luan:logging/Logging") )
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
154 throw new LuanException("Security violation - cannot reload Logging");
1135
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
155 }
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
156 }
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
157 };
1330
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
158 Luan.setSecurity(luan,security);
1135
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
159 }
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
160
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
161 }