annotate src/luan/host/WebHandler.java @ 1599:f2a663a4ba9e

web logging
author Franklin Schmidt <fschmidt@gmail.com>
date Mon, 05 Apr 2021 00:13:05 -0600
parents c78d6a4e2d9a
children 8a717f0b7f45
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;
1501
Franklin Schmidt <fschmidt@gmail.com>
parents: 1454
diff changeset
4 import java.io.IOException;
1402
27efb1fcbcb5 move luan.lib to goodjava
Franklin Schmidt <fschmidt@gmail.com>
parents: 1400
diff changeset
5 import goodjava.logging.Logger;
27efb1fcbcb5 move luan.lib to goodjava
Franklin Schmidt <fschmidt@gmail.com>
parents: 1400
diff changeset
6 import goodjava.logging.LoggerFactory;
1501
Franklin Schmidt <fschmidt@gmail.com>
parents: 1454
diff changeset
7 import goodjava.io.IoUtils;
1402
27efb1fcbcb5 move luan.lib to goodjava
Franklin Schmidt <fschmidt@gmail.com>
parents: 1400
diff changeset
8 import goodjava.webserver.Handler;
27efb1fcbcb5 move luan.lib to goodjava
Franklin Schmidt <fschmidt@gmail.com>
parents: 1400
diff changeset
9 import goodjava.webserver.Request;
27efb1fcbcb5 move luan.lib to goodjava
Franklin Schmidt <fschmidt@gmail.com>
parents: 1400
diff changeset
10 import goodjava.webserver.Response;
27efb1fcbcb5 move luan.lib to goodjava
Franklin Schmidt <fschmidt@gmail.com>
parents: 1400
diff changeset
11 import goodjava.webserver.handlers.DomainHandler;
1598
c78d6a4e2d9a web logging
Franklin Schmidt <fschmidt@gmail.com>
parents: 1578
diff changeset
12 import goodjava.webserver.handlers.IndexHandler;
c78d6a4e2d9a web logging
Franklin Schmidt <fschmidt@gmail.com>
parents: 1578
diff changeset
13 import goodjava.webserver.handlers.ListHandler;
c78d6a4e2d9a web logging
Franklin Schmidt <fschmidt@gmail.com>
parents: 1578
diff changeset
14 import goodjava.webserver.handlers.ContentTypeHandler;
c78d6a4e2d9a web logging
Franklin Schmidt <fschmidt@gmail.com>
parents: 1578
diff changeset
15 import goodjava.webserver.handlers.SafeHandler;
c78d6a4e2d9a web logging
Franklin Schmidt <fschmidt@gmail.com>
parents: 1578
diff changeset
16 import goodjava.webserver.handlers.LogHandler;
1330
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
17 import luan.Luan;
1135
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
18 import luan.LuanException;
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
19 import luan.LuanTable;
1330
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
20 import luan.LuanFunction;
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
21 import luan.LuanClosure;
1335
e0cf0d108a77 major cleanup
Franklin Schmidt <fschmidt@gmail.com>
parents: 1333
diff changeset
22 import luan.LuanRuntimeException;
1185
94cf2576a922 implement WebHandler for nginx
Franklin Schmidt <fschmidt@gmail.com>
parents: 1182
diff changeset
23 import luan.modules.http.LuanHandler;
1598
c78d6a4e2d9a web logging
Franklin Schmidt <fschmidt@gmail.com>
parents: 1578
diff changeset
24 import luan.modules.http.NotFound;
1454
219f2b937f2b remove log4j
Franklin Schmidt <fschmidt@gmail.com>
parents: 1425
diff changeset
25 import luan.modules.logging.LuanLogger;
1135
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
26
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
27
1185
94cf2576a922 implement WebHandler for nginx
Franklin Schmidt <fschmidt@gmail.com>
parents: 1182
diff changeset
28 public class WebHandler implements Handler {
1135
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
29 private static final Logger logger = LoggerFactory.getLogger(WebHandler.class);
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
30
1598
c78d6a4e2d9a web logging
Franklin Schmidt <fschmidt@gmail.com>
parents: 1578
diff changeset
31 private static final class MyHandler implements Handler {
c78d6a4e2d9a web logging
Franklin Schmidt <fschmidt@gmail.com>
parents: 1578
diff changeset
32 private final Handler handler;
c78d6a4e2d9a web logging
Franklin Schmidt <fschmidt@gmail.com>
parents: 1578
diff changeset
33 final LuanHandler luanHandler;
c78d6a4e2d9a web logging
Franklin Schmidt <fschmidt@gmail.com>
parents: 1578
diff changeset
34
c78d6a4e2d9a web logging
Franklin Schmidt <fschmidt@gmail.com>
parents: 1578
diff changeset
35 MyHandler(Handler handler,LuanHandler luanHandler) {
c78d6a4e2d9a web logging
Franklin Schmidt <fschmidt@gmail.com>
parents: 1578
diff changeset
36 this.handler = handler;
c78d6a4e2d9a web logging
Franklin Schmidt <fschmidt@gmail.com>
parents: 1578
diff changeset
37 this.luanHandler = luanHandler;
c78d6a4e2d9a web logging
Franklin Schmidt <fschmidt@gmail.com>
parents: 1578
diff changeset
38 }
c78d6a4e2d9a web logging
Franklin Schmidt <fschmidt@gmail.com>
parents: 1578
diff changeset
39
c78d6a4e2d9a web logging
Franklin Schmidt <fschmidt@gmail.com>
parents: 1578
diff changeset
40 @Override public Response handle(Request request) {
c78d6a4e2d9a web logging
Franklin Schmidt <fschmidt@gmail.com>
parents: 1578
diff changeset
41 return handler.handle(request);
c78d6a4e2d9a web logging
Franklin Schmidt <fschmidt@gmail.com>
parents: 1578
diff changeset
42 }
c78d6a4e2d9a web logging
Franklin Schmidt <fschmidt@gmail.com>
parents: 1578
diff changeset
43 }
c78d6a4e2d9a web logging
Franklin Schmidt <fschmidt@gmail.com>
parents: 1578
diff changeset
44
1315
5763597ca5c0 add DomainHandler
Franklin Schmidt <fschmidt@gmail.com>
parents: 1314
diff changeset
45 private static final DomainHandler.Factory factory = new DomainHandler.Factory() {
5763597ca5c0 add DomainHandler
Franklin Schmidt <fschmidt@gmail.com>
parents: 1314
diff changeset
46 public Handler newHandler(String domain) {
5763597ca5c0 add DomainHandler
Franklin Schmidt <fschmidt@gmail.com>
parents: 1314
diff changeset
47 File dir = new File(sitesDir,domain);
1400
221eedb0f54e fix inner class gc bug
Franklin Schmidt <fschmidt@gmail.com>
parents: 1392
diff changeset
48 if( !dir.exists() )
1315
5763597ca5c0 add DomainHandler
Franklin Schmidt <fschmidt@gmail.com>
parents: 1314
diff changeset
49 return null;
5763597ca5c0 add DomainHandler
Franklin Schmidt <fschmidt@gmail.com>
parents: 1314
diff changeset
50 String dirStr = dir.toString();
1230
034f2a0b3915 better gc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1203
diff changeset
51
1315
5763597ca5c0 add DomainHandler
Franklin Schmidt <fschmidt@gmail.com>
parents: 1314
diff changeset
52 String logDir = dirStr + "/site/private/local/logs/web";
1501
Franklin Schmidt <fschmidt@gmail.com>
parents: 1454
diff changeset
53 try {
Franklin Schmidt <fschmidt@gmail.com>
parents: 1454
diff changeset
54 IoUtils.mkdirs(new File(logDir));
Franklin Schmidt <fschmidt@gmail.com>
parents: 1454
diff changeset
55 } catch(IOException e) {
Franklin Schmidt <fschmidt@gmail.com>
parents: 1454
diff changeset
56 throw new RuntimeException(e);
Franklin Schmidt <fschmidt@gmail.com>
parents: 1454
diff changeset
57 }
1230
034f2a0b3915 better gc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1203
diff changeset
58
1333
25746915a241 merge Luan and LuanState
Franklin Schmidt <fschmidt@gmail.com>
parents: 1332
diff changeset
59 Luan luan = new Luan();
1392
002152af497a hosted postgres
Franklin Schmidt <fschmidt@gmail.com>
parents: 1375
diff changeset
60 initLuan(luan,dirStr,domain);
1598
c78d6a4e2d9a web logging
Franklin Schmidt <fschmidt@gmail.com>
parents: 1578
diff changeset
61 LuanHandler luanHandler = new LuanHandler(luan,domain);
c78d6a4e2d9a web logging
Franklin Schmidt <fschmidt@gmail.com>
parents: 1578
diff changeset
62
c78d6a4e2d9a web logging
Franklin Schmidt <fschmidt@gmail.com>
parents: 1578
diff changeset
63 Handler notFoundHander = new NotFound(luanHandler);
c78d6a4e2d9a web logging
Franklin Schmidt <fschmidt@gmail.com>
parents: 1578
diff changeset
64 Handler handler = new IndexHandler(luanHandler);
c78d6a4e2d9a web logging
Franklin Schmidt <fschmidt@gmail.com>
parents: 1578
diff changeset
65 handler = new ListHandler( handler, notFoundHander );
c78d6a4e2d9a web logging
Franklin Schmidt <fschmidt@gmail.com>
parents: 1578
diff changeset
66 handler = new ContentTypeHandler(handler);
c78d6a4e2d9a web logging
Franklin Schmidt <fschmidt@gmail.com>
parents: 1578
diff changeset
67 handler = new SafeHandler(handler);
1599
f2a663a4ba9e web logging
Franklin Schmidt <fschmidt@gmail.com>
parents: 1598
diff changeset
68 handler = new LogHandler(handler,LogHandler.dirLogger(new File(logDir)));
1598
c78d6a4e2d9a web logging
Franklin Schmidt <fschmidt@gmail.com>
parents: 1578
diff changeset
69
c78d6a4e2d9a web logging
Franklin Schmidt <fschmidt@gmail.com>
parents: 1578
diff changeset
70 return new MyHandler(handler,luanHandler);
1230
034f2a0b3915 better gc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1203
diff changeset
71 }
1315
5763597ca5c0 add DomainHandler
Franklin Schmidt <fschmidt@gmail.com>
parents: 1314
diff changeset
72 };
1230
034f2a0b3915 better gc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1203
diff changeset
73
1330
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
74 public static String securityPassword = "password"; // change for security
1315
5763597ca5c0 add DomainHandler
Franklin Schmidt <fschmidt@gmail.com>
parents: 1314
diff changeset
75 private static final DomainHandler domainHandler = new DomainHandler(factory);
1202
d3a3ca116e42 gc site instances
Franklin Schmidt <fschmidt@gmail.com>
parents: 1187
diff changeset
76 private static String sitesDir = null;
1135
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
77
1185
94cf2576a922 implement WebHandler for nginx
Franklin Schmidt <fschmidt@gmail.com>
parents: 1182
diff changeset
78 public WebHandler(String dir) {
1135
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
79 if( sitesDir != null )
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
80 throw new RuntimeException("already set");
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
81 if( !new File(dir).exists() )
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
82 throw new RuntimeException();
1230
034f2a0b3915 better gc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1203
diff changeset
83 sitesDir = dir;
1454
219f2b937f2b remove log4j
Franklin Schmidt <fschmidt@gmail.com>
parents: 1425
diff changeset
84 LuanLogger.initThreadLogging();
1135
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
85 }
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
86
1315
5763597ca5c0 add DomainHandler
Franklin Schmidt <fschmidt@gmail.com>
parents: 1314
diff changeset
87 @Override public Response handle(Request request) {
5763597ca5c0 add DomainHandler
Franklin Schmidt <fschmidt@gmail.com>
parents: 1314
diff changeset
88 return domainHandler.handle(request);
1135
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
89 }
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
90
1578
c922446f53aa immutable threading
Franklin Schmidt <fschmidt@gmail.com>
parents: 1563
diff changeset
91 public static Object callSite(String domain,String fnName,Object... args) throws LuanException {
1598
c78d6a4e2d9a web logging
Franklin Schmidt <fschmidt@gmail.com>
parents: 1578
diff changeset
92 MyHandler handler = (MyHandler)domainHandler.getHandler(domain);
c78d6a4e2d9a web logging
Franklin Schmidt <fschmidt@gmail.com>
parents: 1578
diff changeset
93 return handler.luanHandler.call_rpc(fnName,args);
1135
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
1392
002152af497a hosted postgres
Franklin Schmidt <fschmidt@gmail.com>
parents: 1375
diff changeset
96 private static void initLuan(Luan luan,String dir,String domain) {
1454
219f2b937f2b remove log4j
Franklin Schmidt <fschmidt@gmail.com>
parents: 1425
diff changeset
97 LuanLogger.startThreadLogging(luan);
1135
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
98 try {
1424
9ab267b9427c better load_file()
Franklin Schmidt <fschmidt@gmail.com>
parents: 1402
diff changeset
99 LuanFunction fn = Luan.loadClasspath(luan,"luan/host/init.luan");
1563
8fbcc4747091 remove LuanFunction.luan
Franklin Schmidt <fschmidt@gmail.com>
parents: 1562
diff changeset
100 fn.call(luan,dir,domain);
1135
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
101 } catch(LuanException e) {
1330
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
102 throw new LuanRuntimeException(e);
1454
219f2b937f2b remove log4j
Franklin Schmidt <fschmidt@gmail.com>
parents: 1425
diff changeset
103 } finally {
219f2b937f2b remove log4j
Franklin Schmidt <fschmidt@gmail.com>
parents: 1425
diff changeset
104 LuanLogger.endThreadLogging();
1135
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
105 }
1425
b6030fa18839 hosting fix
Franklin Schmidt <fschmidt@gmail.com>
parents: 1424
diff changeset
106 security(luan,dir);
1135
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
107 }
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
108
1315
5763597ca5c0 add DomainHandler
Franklin Schmidt <fschmidt@gmail.com>
parents: 1314
diff changeset
109 public static void removeHandler(String domain) {
5763597ca5c0 add DomainHandler
Franklin Schmidt <fschmidt@gmail.com>
parents: 1314
diff changeset
110 domainHandler.removeHandler(domain);
1135
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
1330
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
113 public static void loadHandler(String domain) throws LuanException {
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
114 try {
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
115 domainHandler.getHandler(domain);
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
116 } catch(LuanRuntimeException e) {
1335
e0cf0d108a77 major cleanup
Franklin Schmidt <fschmidt@gmail.com>
parents: 1333
diff changeset
117 throw (LuanException)e.getCause();
1330
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
118 }
1135
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
119 }
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
120
1333
25746915a241 merge Luan and LuanState
Franklin Schmidt <fschmidt@gmail.com>
parents: 1332
diff changeset
121 private static final void security(Luan luan,String dir) {
1174
bdf27aa2a65c fix luanhost security bug
Franklin Schmidt <fschmidt@gmail.com>
parents: 1136
diff changeset
122 final String siteUri = "file:" + dir + "/site";
1330
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
123 Luan.Security security = new Luan.Security() {
1333
25746915a241 merge Luan and LuanState
Franklin Schmidt <fschmidt@gmail.com>
parents: 1332
diff changeset
124 public void check(Luan luan,LuanClosure closure,String op,Object... args)
1330
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
125 throws LuanException
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
126 {
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
127 if( op.equals("uri") ) {
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
128 String name = (String)args[0];
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
129 if( name.startsWith("file:") ) {
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
130 if( name.contains("..") )
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
131 throw new LuanException("Security violation - '"+name+"' contains '..'");
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
132 if( !(name.equals(siteUri) || name.startsWith(siteUri+"/")) )
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
133 throw new LuanException("Security violation - '"+name+"' outside of site dir");
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
134 }
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
135 else if( name.startsWith("classpath:luan/host/") ) {
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
136 throw new LuanException("Security violation");
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
137 }
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
138 else if( name.startsWith("os:") || name.startsWith("bash:") ) {
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
139 throw new LuanException("Security violation");
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
140 }
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
141 } else {
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
142 String name = closure.sourceName;
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
143 if( !(
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
144 name.startsWith("luan:")
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
145 || name.startsWith("classpath:")
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
146 || name.matches("^file:[^/]+$")
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
147 ) )
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
148 throw new LuanException("Security violation - only luan:* modules can load Java");
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
149 if( name.equals("luan:logging/Logging") )
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
150 throw new LuanException("Security violation - cannot reload Logging");
1135
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
151 }
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
152 }
707a5d874f3e add luan.host
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
153 };
1330
f41919741100 fix security
Franklin Schmidt <fschmidt@gmail.com>
parents: 1321
diff changeset
154 Luan.setSecurity(luan,security);
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 }