|
8 | 8 |
|
9 | 9 | function resolve(requrl,docroot='.'){ |
10 | 10 | resolve.df && console.log('=== resolve v2.0 ==='); |
11 | | - resolve.df && console.log('url :',url); |
12 | | - resolve.df && console.log('docroot :',docroot); |
| 11 | + resolve.df && console.log('url : ',url); |
| 12 | + resolve.df && console.log('docroot : ',docroot); |
13 | 13 | var err; |
14 | 14 | try{ |
15 | 15 |
|
|
22 | 22 |
|
23 | 23 | }//catch |
24 | 24 | if(err){ |
25 | | - resolve.df && console.error(err.message); |
| 25 | + resolve.df && console.log('error : ',err.message); |
26 | 26 | var error = 'invalid url'; |
27 | 27 | return {error}; |
28 | 28 | } |
29 | 29 |
|
30 | 30 | var url = requrl; |
31 | 31 |
|
32 | 32 | if(url.indexOf('\\')!=-1){ |
33 | | - resolve.df && console.log('invalid url ( backslash )'); |
| 33 | + resolve.df && console.log('error : ','invalid url ( backslash )'); |
34 | 34 | var error = 'invalid url ( backslash )'; |
35 | 35 | return {error}; |
36 | 36 | } |
37 | 37 |
|
38 | 38 | url = url.slice(1); |
39 | | - resolve.df && console.log('url :',url); |
| 39 | + resolve.df && console.log('url :',url); |
40 | 40 | var root = path.resolve(docroot); |
41 | 41 | //root += path.sep; |
42 | | - resolve.df && console.log('root :',root); |
| 42 | + resolve.df && console.log('root :',root); |
43 | 43 | var abs = path.resolve(docroot,url); |
44 | | - resolve.df && console.log('abs :',abs); |
| 44 | + resolve.df && console.log('abs :',abs); |
45 | 45 |
|
46 | 46 | if(!abs.startsWith(root)){ |
47 | | - resolve.df && console.log('invalid docroot'); |
| 47 | + resolve.df && console.log('error : ','invalid docroot'); |
48 | 48 | var error = 'invalid docroot'; |
49 | 49 | return {error}; |
50 | 50 | } |
51 | 51 |
|
52 | 52 | if(abs.length>root.length){ |
53 | 53 | if(abs[root.length]!=path.sep){ |
54 | | - resolve.df && console.log('invlaid docroot-2'); |
| 54 | + resolve.df && console.log('error : ','invlaid docroot-2'); |
55 | 55 | var error = 'invalid docroot-2'; |
56 | 56 | return {error}; |
57 | 57 | } |
|
62 | 62 | } |
63 | 63 |
|
64 | 64 |
|
65 | | - resolve.df && console.log('ok',abs); |
| 65 | + resolve.df && console.log('ok : ',abs); |
66 | 66 | return {abs}; |
67 | 67 |
|
68 | 68 | }//resolve |
|
0 commit comments