#include "apr_dso.h"
#include "apr_general.h"
#include "apr_pools.h"
+#include "apr_file_info.h"
#include "mod_chxj.h"
#include "chxj_encoding.h"
#include "chxj_chtml30.h"
#include "chxj_chtml40.h"
#include "chxj_chtml50.h"
+#include "chxj_ixhtml10.h"
#include "chxj_jhtml.h"
#include "chxj_jxhtml.h"
#include "chxj_img_conv_format.h"
#include "chxj_cookie.h"
#include "chxj_url_encode.h"
#include "chxj_str_util.h"
+#include "chxj_dump_string.h"
#if defined(USE_MYSQL_COOKIE)
# include "chxj_mysql.h"
#endif
},
{
/* CHXJ_SPEC_Chtml_6_0 */
- .converter = chxj_convert_chtml50,
- .encoder = chxj_encoding,
- .emoji_only_converter = chxj_chtml50_emoji_only_converter,
+ .converter = chxj_convert_ixhtml10,
+ .encoder = chxj_encoding,
+ .emoji_only_converter = chxj_chtml50_emoji_only_converter, /* XXX: TODO */
},
{
/* CHXJ_SPEC_Chtml_7_0 */
- .converter = chxj_convert_chtml50,
- .encoder = chxj_encoding,
- .emoji_only_converter = chxj_chtml50_emoji_only_converter,
+ .converter = chxj_convert_ixhtml10,
+ .encoder = chxj_encoding,
+ .emoji_only_converter = chxj_chtml50_emoji_only_converter, /* XXX: TODO */
},
{
/* CHXJ_SPEC_XHtml_Mobile_1_0 */
}
}
}
+ else{
+ if(strncmp(r->content_type,"image/",6) == 0){
+ if (dconf->image_rewrite == CHXJ_IMG_REWRITE_ON && !apr_table_get(r->headers_in, CHXJ_IMG_X_HTTP_IMAGE_FILENAME)){
+ if(dconf->image_rewrite_mode == CHXJ_IMG_REWRITE_MODE_ALL){
+ // all image
+ apr_table_set(r->headers_in, CHXJ_IMG_X_HTTP_IMAGE_FILENAME, r->filename);
+ apr_table_set(r->headers_in, CHXJ_IMG_X_HTTP_IMAGE_TYPE,r->content_type);
+ r->filename = apr_pstrcat(r->pool,"img-redirect:",dconf->image_rewrite_url,NULL);
+ r->handler = "chxj-image-redirect-handler";
+ return OK;
+ }
+ else{
+ // has _chxj_imgrewrite=on in args
+ char *args_tmp = chxj_url_decode(r->pool, r->args);
+ if (strstr(args_tmp,CHXJ_IMG_REWRITE_URL_STRING)){
+ apr_table_set(r->headers_in, CHXJ_IMG_X_HTTP_IMAGE_FILENAME, r->filename);
+ apr_table_set(r->headers_in, CHXJ_IMG_X_HTTP_IMAGE_TYPE,r->content_type);
+ r->filename = apr_pstrcat(r->pool,"img-redirect:",dconf->image_rewrite_url,NULL);
+ r->handler = "chxj-image-redirect-handler";
+ return OK;
+ }
+ }
+ }
+ }
+ }
chxj_add_device_env(r, spec);
return DECLINED;
}
+static int
+chxj_image_redirect_handler(request_rec *r)
+{
+
+ if (strcmp(r->handler, "chxj-image-redirect-handler")) {
+ return DECLINED;
+ }
+
+ if (strncmp(r->filename, "img-redirect:", 13) != 0) {
+ return DECLINED;
+ }
+ DBG(r,"start chxj_image_redirect_handler");
+ ap_internal_redirect(apr_pstrcat(r->pool, r->filename+13,
+ r->args ? "?" : NULL, r->args, NULL), r);
+ DBG(r,"end chxj_image_redirect_handler");
+ return OK;
+}
+
static void
s_clear_cookie_header(request_rec *r, device_table *spec)
mod_chxj_config *dconf;
chxjconvrule_entry *entryp;
- DBG(r,"REQ[%X] start of chxj_convert() input:[%.*s]", (unsigned int)(apr_size_t)r, (int)*len, *src);
+ DBG(r,"REQ[%X] start of chxj_convert()", (unsigned int)(apr_size_t)r);
+
+ chxj_dump_string(r, APLOG_MARK, "INPUT Data", *src, *len);
+
dst = apr_pstrcat(r->pool, (char *)*src, NULL);
dconf = chxj_get_module_config(r->per_dir_config, &chxj_module);
}
if (!r->header_only) {
+
if ((entryp->action & CONVRULE_COOKIE_ONLY_BIT) && cookie) {
dst = chxj_cookie_only_mode(r, *src, (apr_size_t *)len, cookie);
}
}
}
}
+ if (*len > 0){
+ if (strcasecmp(spec->output_encoding,"UTF-8") == 0){
+ dst = chxj_iconv(r,r->pool,dst,len,"CP932","UTF-8");
+ }
+ }
+
+
ap_set_content_length(r, *len);
if (*len == 0) {
}
+
DBG(r, "REQ[%X] end of chxj_convert()", (unsigned int)(apr_size_t)r);
return dst;
dlen = strlen(value);
DBG(r, "************ before encoding[%s]", value);
- dvalue = chxj_rencoding(r, value, &dlen);
+ dvalue = chxj_rencoding(r, value, &dlen,spec->output_encoding);
dvalue = chxj_url_encode(r->pool, dvalue);
DBG(r, "************ after encoding[%s]", dvalue);
if (name && *name != 0) {
name = chxj_url_decode(r->pool, name);
dlen = strlen(name);
- dname = chxj_rencoding(r, name, &dlen);
+ dname = chxj_rencoding(r, name, &dlen,spec->output_encoding);
dname = chxj_url_encode(r->pool, dname);
}
else {
cookie_t *cookie = NULL;
char *buff_pre;
int no_update_flag = 0;
- apr_size_t ii;
apr_size_t ilen = 0;
apr_pool_t *pool;
result = qs_alloc_zero_byte_string(pool);
- DBG(r, "REQ[%X] +-------------------------------------------------------------------+", (unsigned int)(apr_size_t)r);
- DBG(r, "REQ[%X] | BEFORE input convert source |", (unsigned int)(apr_size_t)r);
- DBG(r, "REQ[%X] +-------------------------------------------------------------------+", (unsigned int)(apr_size_t)r);
- for (ii=0; ii<ilen-64; ii+=64) {
- DBG(r, "REQ[%X] | [%-*.*s] |", (unsigned int)(apr_size_t)r, 64, 64, &s[ii]);
- if (ilen < 64) {
- break;
- }
- }
- if (ilen >= 64 && ((ilen-64) % 64 != 0)) {
- DBG(r, "REQ[%X] | [%-*.*s] |", (unsigned int)(apr_size_t)r, 64, 64, &s[ii]);
- }
- DBG(r, "REQ[%X] +--------------------------------------------------------------------+", (unsigned int)(apr_size_t)r);
+ chxj_dump_string(r, APLOG_MARK, "BEFORE input convert source", s, ilen);
for (;;) {
char *pair_sv;
if (value && *value != 0) {
value = chxj_url_decode(pool, value);
dlen = strlen(value);
- dvalue = chxj_rencoding(r, value, &dlen);
+ dvalue = chxj_rencoding(r, value, &dlen,spec->output_encoding);
dvalue = chxj_url_encode(pool, dvalue);
}
else {
if (name && *name != 0) {
name = chxj_url_decode(pool, name);
dlen = strlen(name);
- dname = chxj_rencoding(r, name, &dlen);
+ dname = chxj_rencoding(r, name, &dlen,spec->output_encoding);
dname = chxj_url_encode(pool, dname);
}
else {
dlen = strlen(value);
value = chxj_url_decode(pool, value);
- dvalue = chxj_rencoding(r, value, &dlen);
+ dvalue = chxj_rencoding(r, value, &dlen,spec->output_encoding);
dvalue = chxj_url_encode(pool,dvalue);
result = apr_pstrcat(pool, result, &name[8], "=", dvalue, NULL);
}
else
if ( strncasecmp(name, CHXJ_QUERY_STRING_PARAM_PREFIX, sizeof(CHXJ_QUERY_STRING_PARAM_PREFIX)-1) == 0) {
- apr_size_t dlen;
+ apr_size_t dlen = 0;
char* dvalue;
- dlen = strlen(value);
- if (dlen && value) {
+ if (value) {
+ dlen = strlen(value);
+ }
+ if (dlen) {
value = chxj_url_decode(pool, value);
- dvalue = chxj_rencoding(r, value, &dlen);
+ dvalue = chxj_rencoding(r, value, &dlen,spec->output_encoding);
dvalue = chxj_url_encode(pool,dvalue);
if (r->args && strlen(r->args) > 0) {
r->args = apr_pstrcat(pool, r->args, "&", &name[sizeof(CHXJ_QUERY_STRING_PARAM_PREFIX)-1], "=", dvalue, NULL);
dlen = strlen(value);
if (dlen && value) {
value = chxj_url_decode(pool, value);
- dvalue = chxj_rencoding(r, value, &dlen);
+ dvalue = chxj_rencoding(r, value, &dlen,spec->output_encoding);
dvalue = chxj_url_encode(pool,dvalue);
if (r->args && strlen(r->args) > 0) {
r->args = apr_pstrcat(pool, r->args, "&", &name[sizeof(CHXJ_QUERY_STRING_PARAM_PREFIX_ENC)-1], "=", dvalue, NULL);
return rv;
}
-
/**
* Add No Cache Header
*/
if (apr_table_get(r->headers_out, "Location") || apr_table_get(r->err_headers_out, "Location")) {
DBG(r, "REQ[%X] found Location header", TO_ADDR(r));
- if (entryp->action & CONVRULE_COOKIE_ON_BIT) {
+ if ((entryp->action & CONVRULE_COOKIE_ON_BIT) || (entryp->action & CONVRULE_COOKIE_ONLY_BIT)) {
cookie_lock_t *lock = NULL;
DBG(r, "REQ[%X] entryp->action == COOKIE_ON_BIT", TO_ADDR(r));
switch(spec->html_spec_type) {
b = APR_BUCKET_NEXT(b)) {
if (apr_bucket_read(b, &data, &len, APR_BLOCK_READ) == APR_SUCCESS) {
- DBG(r, "REQ[%X] read data[%.*s]",(unsigned int)(apr_size_t)r, (int)len, data);
+ chxj_dump_string(r, APLOG_MARK, "READ Data", data, len);
/*--------------------------------------------------------------------*/
/* append data */
DBG(r, "REQ[%X] METHOD [%s]", TO_ADDR(r), r->method);
DBG(r, "REQ[%X] ", (unsigned int)(apr_size_t)r);
DBG(r, "REQ[%X] =======================================================================", (unsigned int)(apr_size_t)r);
+
+ mod_chxj_config *dconf;
+ dconf = chxj_get_module_config(r->per_dir_config, &chxj_module);
+ /*
+ if (dconf->image_rewrite ==CHXJ_IMG_REWRITE_ON ){
+ if(r->args && strcasecmp(r->args,"rewrite") == 0){
+ DBG(r, "image rewrite is ON [%s] - %s", dconf->image_rewrite_url ,r->content_type);
+ r->filename = apr_pstrcat(r->pool,dconf->image_rewrite_url,NULL);
+ return OK;
+ }
+ }
+ */
+
#if 0
return chxj_trans_name(r);
#else
contentType = (char *)apr_table_get(r->headers_in, "Content-Type");
if (contentType
&& strncasecmp("multipart/form-data", contentType, 19) == 0) {
- DBG(r, "REQ[%X] detect multipart/form-data ==> no target", (apr_size_t)(unsigned int)r);
+ DBG(r, "REQ[%X] detect multipart/form-data ==> no target", (unsigned int)(apr_size_t)r);
DBG(r, "REQ[%X] end chxj_insert_filter()", (unsigned int)(apr_size_t)r);
return;
}
ap_hook_handler(chxj_img_conv_format_handler, NULL, NULL, APR_HOOK_MIDDLE);
ap_hook_handler(chxj_qr_code_handler, NULL, NULL, APR_HOOK_MIDDLE);
ap_hook_handler(chxj_input_handler, NULL, NULL, APR_HOOK_MIDDLE);
+
+ ap_hook_handler(chxj_image_redirect_handler, NULL, NULL, APR_HOOK_MIDDLE);
+
ap_hook_translate_name(chxj_translate_name, NULL, NULL, APR_HOOK_MIDDLE);
ap_hook_fixups(chxj_headers_fixup, NULL, NULL, APR_HOOK_FIRST);
+
}
conf->emoji_data_file = NULL;
conf->emoji = NULL;
conf->emoji_tail = NULL;
+ conf->imode_emoji_color = CHXJ_IMODE_EMOJI_COLOR_NONE;
conf->image = CHXJ_IMG_NONE;
conf->image_cache_dir = apr_psprintf(p, "%s",DEFAULT_IMAGE_CACHE_DIR);
conf->image_cache_limit = 0;
conf->cookie_store_type = COOKIE_STORE_TYPE_NONE;
conf->cookie_lazy_mode = 0;
conf->cookie_dbm_type = NULL;
+
+ conf->detect_device_type = CHXJ_ADD_DETECT_DEVICE_TYPE_NONE;
+
#if defined(USE_MYSQL_COOKIE)
memset((void *)&conf->mysql, 0, sizeof(mysql_t));
conf->mysql.port = MYSQL_PORT;
/* Default is copyleft */
conf->image_copyright = NULL;
+ conf->image_rewrite = CHXJ_IMG_REWRITE_NONE;
+ conf->image_rewrite_mode = CHXJ_IMG_REWRITE_MODE_NONE;
+ conf->image_rewrite_url = NULL;
+
return conf;
}
mrg->image_cache_limit = 0;
mrg->emoji = NULL;
mrg->emoji_tail = NULL;
+ mrg->imode_emoji_color = CHXJ_IMODE_EMOJI_COLOR_NONE;
mrg->new_line_type = NLTYPE_NIL;
mrg->forward_url_base = NULL;
mrg->forward_server_ip = NULL;
mrg->allowed_cookie_domain = NULL;
mrg->post_log = NULL;
mrg->cookie_dbm_type = NULL;
+
+ mrg->device_keys = NULL;
+ mrg->device_hash = NULL;
mrg->dir = apr_pstrdup(p, add->dir);
else {
mrg->cookie_dbm_type = base->cookie_dbm_type;
}
+
+ if (add->imode_emoji_color == CHXJ_IMODE_EMOJI_COLOR_NONE) {
+ mrg->imode_emoji_color = base->imode_emoji_color;
+ }
+ else {
+ mrg->imode_emoji_color = add->imode_emoji_color;
+ }
+
+ if (add->detect_device_type == CHXJ_ADD_DETECT_DEVICE_TYPE_NONE) {
+ mrg->detect_device_type = base->detect_device_type;
+ }
+ else {
+ mrg->detect_device_type = add->detect_device_type;
+ }
+
+ if (add->device_keys) {
+ mrg->device_keys = add->device_keys;
+ }
+ else{
+ mrg->device_keys = base->device_keys;
+ }
+
+ if (add->device_hash) {
+ mrg->device_hash = add->device_hash;
+ }
+ else{
+ mrg->device_hash = base->device_hash;
+ }
+
+ if (add->image_rewrite == CHXJ_IMG_REWRITE_NONE){
+ mrg->image_rewrite = base->image_rewrite;
+ }
+ else{
+ mrg->image_rewrite = add->image_rewrite;
+ }
+
+ if (add->image_rewrite_url) {
+ mrg->image_rewrite_url = add->image_rewrite_url;
+ }
+ else{
+ mrg->image_rewrite_url = base->image_rewrite_url;
+ }
+
+ if (add->image_rewrite_mode == CHXJ_IMG_REWRITE_MODE_NONE){
+ mrg->image_rewrite_mode = base->image_rewrite_mode;
+ }
+ else{
+ mrg->image_rewrite_mode = add->image_rewrite_mode;
+ }
+
return mrg;
}
if (strlen(arg) > 256)
return "cache dir name is too long.";
+
+ apr_finfo_t info;
+ apr_status_t res = apr_stat(&info,arg,APR_FINFO_TYPE,parms->pool);
+ if(res != APR_SUCCESS){
+ return apr_psprintf(parms->pool,"ChxjImageCacheDir [%s]: not found ",arg);
+ }
+ else{
+ if(info.filetype != APR_DIR){
+ return apr_psprintf(parms->pool,"ChxjImageCacheDir [%s]: is not directory ",arg);
+ }
+ }
conf = (mod_chxj_config *)mconfig;
conf->image_cache_dir = apr_pstrdup(parms->pool, arg);
if (strcasecmp(CONVRULE_COOKIE_ON_CMD, action) == 0) {
newrule->action |= CONVRULE_COOKIE_ON_BIT;
}
+ else if (strcasecmp(CONVRULE_COOKIE_OFF_CMD, action) == 0) {
+ newrule->action &= (0xffffffff ^ CONVRULE_COOKIE_ON_BIT);
+ }
+ else if (strcasecmp(CONVRULE_CSS_ON_CMD, action) == 0) {
+ newrule->action |= CONVRULE_CSS_ON_BIT;
+ }
+ else if (strcasecmp(CONVRULE_CSS_OFF_CMD, action) == 0) {
+ newrule->action &= (0xffffffff ^ CONVRULE_CSS_ON_BIT);
+ }
else if (strcasecmp(CONVRULE_COOKIE_ONLY_CMD, action) == 0) {
newrule->action |= CONVRULE_COOKIE_ONLY_BIT;
}
return NULL;
}
+static const char *
+cmd_imode_emoji_color(
+ cmd_parms *cmd,
+ void *mconfig,
+ const char *arg)
+{
+ mod_chxj_config *dconf;
+
+ if (strlen(arg) > 256)
+ return "imode emoji color is too long.";
+
+ dconf = (mod_chxj_config *)mconfig;
+ if (strcasecmp("ON", arg) == 0) {
+ dconf->imode_emoji_color = CHXJ_IMODE_EMOJI_COLOR_ON;
+ }
+ else if(strcasecmp("AUTO",arg) == 0) {
+ dconf->imode_emoji_color = CHXJ_IMODE_EMOJI_COLOR_AUTO;
+ }
+ else {
+ dconf->imode_emoji_color = CHXJ_IMODE_EMOJI_COLOR_OFF;
+ }
+
+ return NULL;
+}
+
+static const char *
+cmd_add_device_data_tsv(cmd_parms *parms, void *mconfig, const char *arg)
+{
+ mod_chxj_config *conf;
+
+ if (strlen(arg) > 256)
+ return "mod_chxj: device tsv filename too long.";
+
+ conf = (mod_chxj_config *)mconfig;
+
+ conf->detect_device_type = CHXJ_ADD_DETECT_DEVICE_TYPE_TSV;
+
+ apr_finfo_t info;
+ apr_status_t res = apr_stat(&info,arg,APR_FINFO_TYPE,parms->pool);
+ if(res != APR_SUCCESS){
+ return apr_psprintf(parms->pool,"ChxjDeviceTSV [%s]: not found ",arg);
+ }
+ else{
+ if(info.filetype != APR_REG ){
+ return apr_psprintf(parms->pool,"ChxjDeviceTSV [%s]: is not file ",arg);
+ }
+ }
+ apr_file_t *fp;
+ apr_file_open(&fp, arg, APR_READ|APR_BUFFERED, APR_OS_DEFAULT, parms->pool);
+
+ chxj_load_device_tsv_data(fp,parms->pool,conf);
+
+ apr_file_close(fp);
+ return NULL;
+}
+
+static const char *
+cmd_image_rewrite(cmd_parms *parms, void *mconfig, const char *arg)
+{
+ mod_chxj_config *conf;
+ if (strlen(arg) > 256){
+ return "mod_chxj: set rewrite too long.";
+ }
+ conf = (mod_chxj_config *)mconfig;
+ if (strcasecmp("ON", arg) == 0) {
+ conf->image_rewrite = CHXJ_IMG_REWRITE_ON;
+ }
+ else if(strcasecmp("OFF",arg) == 0) {
+ conf->image_rewrite = CHXJ_IMG_REWRITE_OFF;
+ }
+ else {
+ conf->image_rewrite = CHXJ_IMG_REWRITE_NONE;
+ }
+ return NULL;
+}
+
+static const char *
+cmd_image_rewrite_url(cmd_parms *parms, void *mconfig, const char *arg)
+{
+ mod_chxj_config *conf;
+ if (strlen(arg) > 256){
+ return "mod_chxj: set rewrite url too long.";
+ }
+ conf = (mod_chxj_config *)mconfig;
+ conf->image_rewrite_url = apr_pstrdup(parms->pool, arg);;
+ return NULL;
+}
+
+static const char *
+cmd_image_rewrite_mode(cmd_parms *parms, void *mconfig, const char *arg)
+{
+ mod_chxj_config *conf;
+ if (strlen(arg) > 256){
+ return "mod_chxj: set rewrite mode is too long.";
+ }
+
+ conf = (mod_chxj_config *)mconfig;
+ if (strcasecmp("all",arg) == 0) {
+ conf->image_rewrite_mode = CHXJ_IMG_REWRITE_MODE_ALL;
+ }
+ else if (strcasecmp("user",arg) == 0) {
+ conf->image_rewrite_mode = CHXJ_IMG_REWRITE_MODE_USER;
+ }
+ else if (strcasecmp("tag",arg) == 0) {
+ conf->image_rewrite_mode = CHXJ_IMG_REWRITE_MODE_TAG;
+ }
+ else{
+ conf->image_rewrite_mode = CHXJ_IMG_REWRITE_MODE_NONE;
+ }
+ return NULL;
+}
static const command_rec cmds[] = {
AP_INIT_TAKE1(
NULL,
OR_ALL,
"Kind of DBM used with Cookie simulator.(default|GDBM|SDBM|DB|NDBM)"),
+ AP_INIT_TAKE1(
+ "ChxjImodeEmojiColor",
+ cmd_imode_emoji_color,
+ NULL,
+ OR_ALL,
+ "Auto i-mode emoji color"),
+ AP_INIT_TAKE1(
+ "ChxjAddDeviceDataTSV",
+ cmd_add_device_data_tsv,
+ NULL,
+ OR_ALL,
+ "Additional devices TSV data"),
+ AP_INIT_TAKE1(
+ "ChxjImageRewrite",
+ cmd_image_rewrite,
+ NULL,
+ OR_ALL,
+ "Rewrite Image"
+ ),
+ AP_INIT_TAKE1(
+ "ChxjImageRewriteUrl",
+ cmd_image_rewrite_url,
+ NULL,
+ OR_ALL,
+ "Set rewrite Image url"
+ ),
+ AP_INIT_TAKE1(
+ "ChxjImageRewriteMode",
+ cmd_image_rewrite_mode,
+ NULL,
+ OR_ALL,
+ "Set rewrite Image rewrite url mode"
+ ),
{NULL,{NULL},NULL,0,0,NULL},
};